MERGE

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -269,6 +269,7 @@ public class UserSubscribeController extends BaseController {
             export.setUserName("李小米");
             export.setIdCard("44086921356895125365");
             export.setApplyName(bo.getApplyName());
+            export.setStudentType("是");
             export.setApplySiteAddress(bo.getApplySiteAddress());
             if (ObjectUtils.isNotNull(siteTime)){
                 List<ExamApplySiteTimeTwoAddBo> siteTimeTwoAddBos = JSONArray.parseArray(siteTime.getSiteTime(), ExamApplySiteTimeTwoAddBo.class);
@@ -301,7 +302,7 @@ public class UserSubscribeController extends BaseController {
             export.setApplySiteTime("9:00-12:00");
             export.setCode("SP6415428604");
             export.setGoodsName("一级建造师继续教育（必修课+机电工程）");
-
+            export.setStudentType("是");
             export.setApplySiteAddressTrain(bo.getApplySiteAddressTrain());
             if (ObjectUtils.isNotNull(siteTime)){
                 List<ExamApplySiteTimeTwoAddBo> siteTimeTwoAddBos = JSONArray.parseArray(siteTime.getSiteTime(), ExamApplySiteTimeTwoAddBo.class);

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/SysTenantServiceImpl.java

@@ -21,6 +21,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.system.bo.*;
+import com.zhongzheng.modules.system.domain.SysOldOrg;
 import com.zhongzheng.modules.system.domain.SysRoleMenu;
 import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.mapper.SysRoleMenuMapper;
@@ -74,6 +75,8 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
     @Autowired
     private ISysDictTypeService iSysDictTypeService;
+    @Autowired
+    private ISysOldOrgService iSysOldOrgService;
 
     @Autowired
     @Lazy
@@ -92,7 +95,13 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 
     @Override
     public List<SysTenantVo> queryList(SysTenantQueryBo bo) {
+
         LambdaQueryWrapper<SysTenant> lqw = Wrappers.lambdaQuery();
+        List<SysOldOrg> sysOldOrgs = iSysOldOrgService.list(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getStatus, 1).eq(SysOldOrg::getOperationType, bo.getOperationType()));
+        if (ObjectUtils.isNotEmpty(bo.getOperationType())){
+            List<Long> tenantIds = sysOldOrgs.stream().map(SysOldOrg::getTenantId).collect(Collectors.toList());
+            lqw.in(ObjectUtils.isNotEmpty(tenantIds),SysTenant::getTenantId,tenantIds);
+        }
         lqw.ne(SysTenant::getStatus, -1);
         lqw.like(StrUtil.isNotBlank(bo.getTenantName()), SysTenant::getTenantName, bo.getTenantName());
         lqw.eq(ObjectUtils.isNotNull(bo.getTenantid()),SysTenant::getTenantId, bo.getTenantid());

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderBusinessConfigServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongzheng.modules.order.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.course.domain.CourseChapter;

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/bo/SysTenantQueryBo.java

@@ -123,6 +123,8 @@ public class SysTenantQueryBo extends BaseEntity {
 
 	@ApiModelProperty("后台域名")
 	private String hostAdmin;
+	@ApiModelProperty("运营模式 1代运营 2独立运营")
+	private Long operationType;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeExport.java

@@ -56,5 +56,6 @@ public class UserSubscribeExport {
 
 	@Excel(name = "失败原因")
 	private String cause;
-
+	@Excel(name = "是否补考学员(是/否)")
+	private String studentType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeImport.java

@@ -90,4 +90,6 @@ public class UserSubscribeImport {
 
 	@Excel(name = "失败原因")
 	private String cause;
+	@Excel(name = "是否补考学员(是/否)")
+	private String studentType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeTrainExport.java

@@ -61,5 +61,6 @@ public class UserSubscribeTrainExport {
 
 	@Excel(name = "失败原因")
 	private String cause;
-
+	@Excel(name = "是否补考学员(是/否)")
+	private String studentType;
 }