refactor: 简化单位类型更新逻辑

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/refresh/commonUpdate/BaseEnterpriseUpdate.java

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.EsBaseEnterpriseInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.thymeleaf.util.ListUtils;
 
 import java.util.List;
 
@@ -19,24 +20,30 @@ public class BaseEnterpriseUpdate {
     public final String jcjgCode = "1233-2";
 
     public String updateJyjcUnitType(String oldUnitType, List<EsBaseEnterpriseInfo.License> unitLicences) {
-        long jyjgCount = unitLicences.stream().filter(e -> e.getCertTypeCode().equals(jyjgCode)).count();
-        long jcjgCount = unitLicences.stream().filter(e -> e.getCertTypeCode().equals(jcjgCode)).count();
-        StringBuilder afterType = new StringBuilder();
-        // 如果资质中不含有检验和检测资质，则不更新单位类型
-        if (jcjgCount == 0 && jyjgCount == 0) {
+
+        // 如果单位类型中包含检验检测机构、检测单位、检验单位，且有资质信息，则更新单位类型
+        if ((oldUnitType.contains(jyjcjg) || oldUnitType.contains(jydw) || oldUnitType.contains(jcdw)) && !ListUtils.isEmpty(unitLicences)) {
+            long jyjgCount = unitLicences.stream().filter(e -> e.getCertTypeCode().equals(jyjgCode)).count();
+            long jcjgCount = unitLicences.stream().filter(e -> e.getCertTypeCode().equals(jcjgCode)).count();
+            StringBuilder afterType = new StringBuilder();
+            // 如果资质中不含有检验和检测资质，则不更新单位类型
+            if (jcjgCount == 0 && jyjgCount == 0) {
+                return oldUnitType;
+            }
+            // 处理旧的单位类型
+            oldUnitType = oldUnitType.replace(jyjcjg, "").replace(jcdw, "").replace(jydw, "");
+            oldUnitType = oldUnitType.replace("##", "#");
+            oldUnitType = oldUnitType.startsWith("#") ? oldUnitType.substring(1) : oldUnitType;
+            oldUnitType = oldUnitType.endsWith("#") ? oldUnitType.substring(0, oldUnitType.length() - 1) : oldUnitType;
+            if (jcjgCount > 0) {
+                afterType.append("#").append(jcdw);
+            }
+            if (jyjgCount > 0) {
+                afterType.append("#").append(jydw);
+            }
+            return oldUnitType + afterType;
+        } else {
             return oldUnitType;
         }
-        // 处理旧的单位类型
-        oldUnitType = oldUnitType.replace(jyjcjg, "").replace(jcdw, "").replace(jydw, "");
-        oldUnitType = oldUnitType.replace("##", "#");
-        oldUnitType = oldUnitType.startsWith("#") ? oldUnitType.substring(1) : oldUnitType;
-        oldUnitType = oldUnitType.endsWith("#") ? oldUnitType.substring(0, oldUnitType.length() - 1) : oldUnitType;
-        if (jcjgCount > 0) {
-            afterType.append("#").append(jcdw);
-        }
-        if (jyjgCount > 0) {
-            afterType.append("#").append(jydw);
-        }
-        return oldUnitType + afterType;
     }
 }

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

@@ -57,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StopWatch;
-import org.thymeleaf.util.ListUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
@@ -1441,10 +1440,7 @@ public class DataHandlerServiceImpl {
                 return esLicense;
             }).collect(Collectors.toList());
             esBaseEnterpriseInfo.setLicenses(licenses);
-            if ((enterpriseInfo.getUnitType().contains(baseEnterpriseUpdate.jyjcjg) || enterpriseInfo.getUnitType().contains(baseEnterpriseUpdate.jydw) || enterpriseInfo.getUnitType().contains(baseEnterpriseUpdate.jcdw)) && !ListUtils.isEmpty(licenses)) {
-                String newUnitType = baseEnterpriseUpdate.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses);
-                esBaseEnterpriseInfo.setUnitType(newUnitType);
-            }
+            esBaseEnterpriseInfo.setUnitType(baseEnterpriseUpdate.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
             return esBaseEnterpriseInfo;
         }).collect(Collectors.toList());
         enterpriseInfoDao.saveAll(esBaseEnterpriseInfos);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java

@@ -21,7 +21,6 @@ import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.thymeleaf.util.ListUtils;
 
 import java.util.List;
 import java.util.Optional;
@@ -78,10 +77,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
                     return esLicense;
                 }).collect(Collectors.toList());
                 esBaseEnterpriseInfo.setLicenses(licenses);
-                if ((enterpriseInfo.getUnitType().contains(baseEnterpriseUpdate.jyjcjg) || enterpriseInfo.getUnitType().contains(baseEnterpriseUpdate.jydw) || enterpriseInfo.getUnitType().contains(baseEnterpriseUpdate.jcdw)) && !ListUtils.isEmpty(licenses)) {
-                    String newUnitType = baseEnterpriseUpdate.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses);
-                    esBaseEnterpriseInfo.setUnitType(newUnitType);
-                }
+                esBaseEnterpriseInfo.setUnitType(baseEnterpriseUpdate.updateJyjcUnitType(enterpriseInfo.getUnitType(), licenses));
                 enterpriseInfoDao.save(esBaseEnterpriseInfo);
                 // 人员更新冗余的单位信息
                 List<TzsUserInfo> userOfOneUnit = userInfoMapper.selectList(new LambdaQueryWrapper<TzsUserInfo>().eq(TzsUserInfo::getUnitCode, enterpriseInfo.getUseUnitCode()).eq(BaseEntity::getIsDelete, false).select(BaseEntity::getSequenceNbr));