仓房已选逻辑优化

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/dwxx/DwxxDO.java

@@ -99,10 +99,6 @@ public class DwxxDO extends BaseDO {
      * 审核状态 0、未审核  1、已审核
      */
     private Integer shzt;
-    /**
-     * 标志	区分省级库区还是中储粮
-     */
-    private String bz;
 
     /**
      * 通讯地址-具体地址
@@ -117,10 +113,6 @@ public class DwxxDO extends BaseDO {
      */
     private String dwDeptId;
     /**
-     * 上报id
-     */
-    private Integer sbid;
-    /**
      * 数据来源
      */
     private Integer sjly;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/kqxx/KqxxDO.java

@@ -88,10 +88,6 @@ public class KqxxDO extends BaseDO {
      */
     private Integer wtbgckj;
     /**
-     * 标识  区分省级库区还是中储粮
-     */
-    private String bs;
-    /**
      * 库区地址-市
      */
     private String shi;
@@ -112,13 +108,7 @@ public class KqxxDO extends BaseDO {
      */
     private String shxydm;
     /**
-     * 库区产权
-     */
-    private String kqcq;
-    /**
      * 数据来源
      */
     private Integer sjly;
-    /** 库区性质 */
-    private Integer kqxz;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/kqxx/KqxxMapper.java

@@ -32,7 +32,6 @@ public interface KqxxMapper extends BaseMapperX<KqxxDO> {
                 .eqIfPresent(KqxxDO::getLxdh, reqVO.getLxdh())
                 .eqIfPresent(KqxxDO::getZdmj, reqVO.getZdmj())
                 .eqIfPresent(KqxxDO::getResid, reqVO.getResid())
-                .eqIfPresent(KqxxDO::getBs, reqVO.getBs())
                 .betweenIfPresent(KqxxDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(KqxxDO::getShi, reqVO.getShi())
                 .eqIfPresent(KqxxDO::getXian, reqVO.getXian())

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -384,70 +384,84 @@ public class DwxxServiceImpl implements DwxxService {
     @Transactional
     public void createCaAndKuAndDWForSheng(CaxxUpdateReqVO updateReqVO) {
         if (updateReqVO.getKqId() != null) {
-            CodingKqxxDO codingKqxxDO = codingKqxxMapper.selectById(updateReqVO.getKqId());
-            if (ObjectUtils.isEmpty(codingKqxxDO)) {
-                throw exception(ERROR, "当前库区信息不存在！");
-            }
-            KqxxDO kqxxDO = BeanUtils.toBean(codingKqxxDO, KqxxDO.class);
-
-            String shengAll = kqxxDO.getSheng();
-            String[] parts = shengAll.split(",");
-            for (int i = 0; i < parts.length; i++) {
-                parts[i] = parts[i].trim(); // 去除空格
-            }
-            String province = null;
-            String city = null;
-            String county = null;
-            if (parts.length != 0) {
-                province = parts[0];
-                if (parts.length == 3) {
-                    city = parts[1];
-                    county = parts[2];
+            KqxxDO kqxxDOExist = kqxxMapper.selectById(updateReqVO.getKqId());
+            if (ObjectUtils.isEmpty(kqxxDOExist)) {
+                CodingKqxxDO codingKqxxDO = codingKqxxMapper.selectById(updateReqVO.getKqId());
+                if (ObjectUtils.isEmpty(codingKqxxDO)) {
+                    throw exception(ERROR, "当前库区信息不存在！");
                 }
-                if (parts.length == 2) {
-                    city = parts[1];
+                KqxxDO kqxxDO = BeanUtils.toBean(codingKqxxDO, KqxxDO.class);
+                String shengAll = kqxxDO.getSheng();
+                String[] parts = shengAll.split(",");
+                for (int i = 0; i < parts.length; i++) {
+                    parts[i] = parts[i].trim(); // 去除空格
                 }
+                String province = null;
+                String city = null;
+                String county = null;
+                if (parts.length != 0) {
+                    province = parts[0];
+                    if (parts.length == 3) {
+                        city = parts[1];
+                        county = parts[2];
+                    }
+                    if (parts.length == 2) {
+                        city = parts[1];
+                    }
+                }
+                List<AreaLevelDO> areaLevelDOS = areaLevelMapper.selectListByName(Arrays.asList(province, city, county));
+                if (ObjectUtils.isEmpty(areaLevelDOS)) {
+                    throw exception(ERROR, "当前库区所在的行政区划不存在！");
+                }
+                Map<String, String> map = areaLevelDOS.stream().collect(Collectors.toMap(AreaLevelDO::getAreaName, AreaLevelDO::getAreaCode, (x, y) -> x));
+                if (province != null) {
+                    String shengCode = map.get(province);
+                    kqxxDO.setSheng(shengCode);
+                }
+                if (city != null) {
+                    String shiCode = map.get(city);
+                    kqxxDO.setShi(shiCode);
+                }
+                if (county != null) {
+                    String xianCode = map.get(county);
+                    kqxxDO.setXian(xianCode);
+                }
+                kqxxDO.setSjly(1);
+                kqxxMapper.insert(kqxxDO);
             }
-            List<AreaLevelDO> areaLevelDOS = areaLevelMapper.selectListByName(Arrays.asList(province, city, county));
-            if (ObjectUtils.isEmpty(areaLevelDOS)) {
-                throw exception(ERROR, "当前库区所在的行政区划不存在！");
-            }
-            Map<String, String> map = areaLevelDOS.stream().collect(Collectors.toMap(AreaLevelDO::getAreaName, AreaLevelDO::getAreaCode, (x, y) -> x));
-            if (province != null) {
-                String shengCode = map.get(province);
-                kqxxDO.setSheng(shengCode);
-            }
-            if (city != null) {
-                String shiCode = map.get(city);
-                kqxxDO.setShi(shiCode);
-            }
-            if (county != null) {
-                String xianCode = map.get(county);
-                kqxxDO.setXian(xianCode);
-            }
-            kqxxDO.setSjly(1);
-            kqxxMapper.insert(kqxxDO);
         }
         if (updateReqVO.getDeptId() != null) {
-            CodingDwxxDO codingDwxxDO = codingDwxxMapper.selectById(updateReqVO.getDeptId());
-            if (ObjectUtils.isEmpty(codingDwxxDO)) {
-                throw exception(ERROR, "当前单位信息不存在！");
+            DwxxDO dwxxDOExist = dwxxMapper.selectById(updateReqVO.getDeptId());
+            if (ObjectUtils.isEmpty(dwxxDOExist)) {
+                CodingDwxxDO codingDwxxDO = codingDwxxMapper.selectById(updateReqVO.getDeptId());
+                if (ObjectUtils.isEmpty(codingDwxxDO)) {
+                    throw exception(ERROR, "当前单位信息不存在！");
+                }
+                DwxxDO dwxxDO = BeanUtils.toBean(codingDwxxDO, DwxxDO.class);
+                dwxxDO.setSjly(1);
+                dwxxMapper.insert(dwxxDO);
             }
-            DwxxDO dwxxDO = BeanUtils.toBean(codingDwxxDO, DwxxDO.class);
-            dwxxDO.setSjly(1);
-            dwxxMapper.insert(dwxxDO);
         }
         if (!ObjectUtils.isEmpty(updateReqVO.getIds())) {
             List<CodingCaxxDO> codingCaxxDOS = codingCaxxMapper.selectList(CodingCaxxDO::getId, updateReqVO.getIds());
             if (ObjectUtils.isEmpty(codingCaxxDOS)) {
                 throw exception(ERROR, "所选仓房信息不存在！");
             }
+            List<CaxxDO> caxxDOSExist = caxxMapper.selectListByKqId(updateReqVO.getKqId());
             List<CaxxDO> caxxDOS = BeanUtils.toBean(codingCaxxDOS, CaxxDO.class);
-            caxxDOS.stream().forEach(s -> {
-                s.setSjly(1);
-                s.setYxcf(1);
-            });
-            caxxMapper.insertBatch(caxxDOS);
+            if (!ObjectUtils.isEmpty(caxxDOS)) {
+                if (!ObjectUtils.isEmpty(caxxDOSExist)) {
+                    List<Long> idsExist = caxxDOSExist.stream().map(CaxxDO::getId).collect(Collectors.toList());
+                     caxxDOS.removeIf(caxxDO -> idsExist.contains(caxxDO.getId()));
+                }
+                if (!ObjectUtils.isEmpty(caxxDOS)){
+                    caxxDOS.stream().forEach(s -> {
+                        s.setSjly(1);
+                        s.setYxcf(1);
+                    });
+                    caxxMapper.insertBatch(caxxDOS);
+                }
+            }
         }
     }