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

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

@@ -1472,7 +1472,7 @@ public class    DataHandlerServiceImpl {
         log.info("综合统计企业信息入库开始");
         StopWatch watch = new StopWatch();
         watch.start();
-        List<TzBaseEnterpriseInfo> units = tzBaseEnterpriseInfoMapper.selectList(new LambdaQueryWrapper<TzBaseEnterpriseInfo>().eq(BaseEntity::getIsDelete, false));
+        List<TzBaseEnterpriseInfo> units = tzBaseEnterpriseInfoMapper.selectList(null);
         List<EsBaseEnterpriseInfo> esBaseEnterpriseInfos = units.parallelStream().map(enterpriseInfo -> {
             EsBaseEnterpriseInfo esBaseEnterpriseInfo = new EsBaseEnterpriseInfo();
             BeanUtil.copyProperties(enterpriseInfo, esBaseEnterpriseInfo);
@@ -1517,7 +1517,7 @@ public class    DataHandlerServiceImpl {
                         TzBaseEnterpriseInfo::getSuperviseOrgCode,
                         TzBaseEnterpriseInfo::getSuperviseOrgName,
                         TzBaseEnterpriseInfo::getOfficeRegion
-                ).eq(BaseEntity::getIsDelete, false));
+                ));
         Map<String, TzBaseEnterpriseInfo> useCodeEnterpriseMap = units.stream().collect(Collectors.toMap(TzBaseEnterpriseInfo::getUseCode, Function.identity(), (k1, k2) -> k2));
         Iterable<EsBaseEnterpriseInfo> esBaseEnterpriseInfoIterable = enterpriseInfoDao.findAll();
         List<EsBaseEnterpriseInfo> esBaseEnterpriseInfos = Lists.newArrayList(esBaseEnterpriseInfoIterable);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/ThreeSystemsController.java

@@ -48,6 +48,7 @@ public class ThreeSystemsController<string> extends BaseController {
 		Page<ThreeSystems> threeSystemsPage = new Page<>();
 		try {
 			threeSystemsPage.setRecords(iThreeSystemsService.getStatisticsMessage(list, planType, startDate, endDate));
+			threeSystemsPage.setTotal(threeSystemsPage.getRecords().size());
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dao.EsBaseEnterpriseInfoDao;
-import com.yeejoin.amos.boot.module.common.api.entity.EsBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
@@ -28,7 +27,10 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -62,20 +64,10 @@ public class EnterpriseManageServiceImpl {
             this.deleteEnterprise(e);
             this.deleteAmosUser(e);
             this.deleteAmosCompany(e);
-            this.deleteEsEnterpriseInfo(e);
         });
         return true;
     }
 
-    private List<String> castIds2UseUnitCodes(List<String> ids, List<TzBaseEnterpriseInfo> enterpriseInfos) {
-        List<String> useUnitCodes = new ArrayList<>();
-        Map<String, String> map = enterpriseInfos.stream().collect(Collectors.toMap(s -> String.valueOf(s.getSequenceNbr()), TzBaseEnterpriseInfo::getUseUnitCode));
-        ids.forEach(id -> {
-            useUnitCodes.add(map.get(id));
-        });
-        return useUnitCodes;
-    }
-
     /**
      * 批量启用企业
      *
@@ -176,14 +168,6 @@ public class EnterpriseManageServiceImpl {
         }
     }
 
-
-    private void deleteEsEnterpriseInfo(TzBaseEnterpriseInfo e) {
-        Optional<EsBaseEnterpriseInfo> op = esBaseEnterpriseInfoDao.findById(e.getSequenceNbr() + "");
-        op.ifPresent(v -> {
-            esBaseEnterpriseInfoDao.deleteById(v.getSequenceNbr());
-        });
-    }
-
     private void checkForUse(List<TzBaseEnterpriseInfo> enterpriseInfos, Map<String, Long> seqUseNumMap, String type) {
         if (seqUseNumMap.values().stream().reduce(0L, Long::sum) > 0) {
             List<String> useNames = new ArrayList<>();