feat(tcm): 监管删除启停用企业

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java

@@ -301,6 +301,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	@ApiModelProperty(value = "企业下人")
 	List<UserPermissionDto> userPermissionList;
 
+	@ApiModelProperty(value = "启停状态")
+	private String enableStatus;
+
 	private String region;
 
 	private String fullAddress;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -167,6 +167,9 @@
 			<if test="tzBaseEnterpriseInfoDto.address!=null and tzBaseEnterpriseInfoDto.address!='' ">
 				AND address LIKE CONCAT('%', #{tzBaseEnterpriseInfoDto.address},'%')
 			</if>
+			<if test="tzBaseEnterpriseInfoDto.enableStatus!=null and tzBaseEnterpriseInfoDto.enableStatus!='' ">
+				AND is_delete = #{tzBaseEnterpriseInfoDto.enableStatus}
+			</if>
 			<if test="tzBaseEnterpriseInfoDto.regulatoryLabels!=null and tzBaseEnterpriseInfoDto.regulatoryLabels!='' ">
 				AND regulatory_labels LIKE CONCAT('%', #{tzBaseEnterpriseInfoDto.regulatoryLabels},'%')
 			</if>
@@ -192,13 +195,12 @@
 			<if test="orgCode != null and orgCode != ''">
 				AND supervise_org_code LIKE CONCAT('%', #{orgCode}, '%')
 			</if>
-			AND is_delete = 0
 		</where>
 		order by
 		<if test="sort != null">
 			${sort.field} ${sort.sortType},
 		</if>
-		create_date DESC,sequence_nbr DESC
+		create_date DESC
 	</select>
 
 	<select id="selectByUseUnit" resultType="com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo">

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/EnterpriseManageServiceImpl.java

@@ -130,27 +130,29 @@ public class EnterpriseManageServiceImpl {
     private void clearPatrolData(TzBaseEnterpriseInfo enterpriseInfo) {
         //删除planTask
         List<String> planTaskIds = patrolMapper.selectPlanTaskIdsByUseCode(enterpriseInfo.getUseCode());
-        if (planTaskIds.size() > 5000) {
-            int index = 5000;
-            for (int i = 0; i < planTaskIds.size(); i += 5000) {
-                if (i + 5000 > planTaskIds.size()) {
-                    index = planTaskIds.size() - i;
+        if(!planTaskIds.isEmpty()){
+            if (planTaskIds.size() > 5000) {
+                int index = 5000;
+                for (int i = 0; i < planTaskIds.size(); i += 5000) {
+                    if (i + 5000 > planTaskIds.size()) {
+                        index = planTaskIds.size() - i;
+                    }
+                    List<String> subList = planTaskIds.subList(i, i + index);
+                    List<ESTaskDetailDto> maps = patrolMapper.findAllByTaskNos(subList);
+                    esTaskDetail.deleteAll(maps);
+                    List<ESPlanTaskListDto> esPlanTaskListDtos = subList.stream().map(item -> new ESPlanTaskListDto().setId(item)).collect(Collectors.toList());
+                    esPlanTaskList.deleteAll(esPlanTaskListDtos);
+                    patrolMapper.deleteAllPlanTaskDetailByTaskNos(subList);
+                    patrolMapper.deleteAllPlanTaskById(subList);
                 }
-                List<String> subList = planTaskIds.subList(i, i + index);
-                List<ESTaskDetailDto> maps = patrolMapper.findAllByTaskNos(subList);
+            } else {
+                List<ESTaskDetailDto> maps = patrolMapper.findAllByTaskNos(planTaskIds);
                 esTaskDetail.deleteAll(maps);
-                List<ESPlanTaskListDto> esPlanTaskListDtos = subList.stream().map(item -> new ESPlanTaskListDto().setId(item)).collect(Collectors.toList());
+                List<ESPlanTaskListDto> esPlanTaskListDtos = planTaskIds.stream().map(item -> new ESPlanTaskListDto().setId(item)).collect(Collectors.toList());
                 esPlanTaskList.deleteAll(esPlanTaskListDtos);
-                patrolMapper.deleteAllPlanTaskDetailByTaskNos(subList);
-                patrolMapper.deleteAllPlanTaskById(subList);
+                patrolMapper.deleteAllPlanTaskDetailByTaskNos(planTaskIds);
+                patrolMapper.deleteAllPlanTaskById(planTaskIds);
             }
-        } else {
-            List<ESTaskDetailDto> maps = patrolMapper.findAllByTaskNos(planTaskIds);
-            esTaskDetail.deleteAll(maps);
-            List<ESPlanTaskListDto> esPlanTaskListDtos = planTaskIds.stream().map(item -> new ESPlanTaskListDto().setId(item)).collect(Collectors.toList());
-            esPlanTaskList.deleteAll(esPlanTaskListDtos);
-            patrolMapper.deleteAllPlanTaskDetailByTaskNos(planTaskIds);
-            patrolMapper.deleteAllPlanTaskById(planTaskIds);
         }
     }
 
@@ -160,8 +162,8 @@ public class EnterpriseManageServiceImpl {
     }
 
     private void unlockLoginAccount(TzBaseEnterpriseInfo enterpriseInfo) {
-        // Lambda 形式
-        Set<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByOrgCode(enterpriseInfo.getOrgCode(), null));
+        CompanyModel companyModel = FeignUtil.remoteCall(() -> Privilege.companyClient.queryByCompanyCode(enterpriseInfo.getUseCode()));
+        List<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByCompanyId(companyModel.getSequenceNbr(), null, null,false));
         if (!userModels.isEmpty()) {
             List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
             Privilege.agencyUserClient.unlockUsers(String.join(",", userIds));
@@ -177,8 +179,8 @@ public class EnterpriseManageServiceImpl {
     }
 
     private void lockLoginAccount(TzBaseEnterpriseInfo enterpriseInfo) {
-        // Lambda 形式
-        Set<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByOrgCode(enterpriseInfo.getOrgCode(), null));
+        CompanyModel companyModel = FeignUtil.remoteCall(() -> Privilege.companyClient.queryByCompanyCode(enterpriseInfo.getUseCode()));
+        List<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByCompanyId(companyModel.getSequenceNbr(), null, null,false));
         if (!userModels.isEmpty()) {
             List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
             Privilege.agencyUserClient.lockUsers(String.join(",", userIds));
@@ -262,8 +264,8 @@ public class EnterpriseManageServiceImpl {
     }
 
     private void deleteAmosUser(TzBaseEnterpriseInfo e) {
-        // Lambda 形式
-        Set<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByOrgCode(e.getOrgCode(), null));
+        CompanyModel companyModel = FeignUtil.remoteCall(() -> Privilege.companyClient.queryByCompanyCode(e.getUseCode()));
+        List<AgencyUserModel> userModels = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryByCompanyId(companyModel.getSequenceNbr(), null, null,false));
         if (!userModels.isEmpty()) {
             List<String> userIds = userModels.stream().map(AgencyUserModel::getUserId).collect(Collectors.toList());
             Privilege.agencyUserClient.multDeleteUser(String.join(",", userIds), true);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -237,7 +237,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 			List<RegUnitInfo> regUnitInfoList = regUnitInfoService.lambdaQuery().select(RegUnitInfo::getUnitCode, RegUnitInfo::getAdminLoginPwd)
 					.eq(RegUnitInfo::getName, tzBaseEnterpriseInfoDto.getUseUnit()).list();
 			regUnitInfoList.forEach(info -> System.out.println("unitCode=" + info.getUnitCode() + ", adminLoginPwd=" + info.getAdminLoginPwd()));
-			return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCode, sortMap, officeRegion);
+			IPage<TzBaseEnterpriseInfoDto> page2 = this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCode, sortMap, officeRegion);
+			page2.getRecords().forEach(info -> {
+				info.setEnableStatus(info.getIsDelete() ? "停用" : "启用");
+			});
+			return page2;
 		} catch (Exception ex) {
 			String msg = ex.getMessage() == null ? "" : ex.getMessage();
 			if (msg.contains("eyibc decrypt error")