备选交收库列表核验状态调整

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/vo/SpareRespVO.java

@@ -60,6 +60,8 @@ public class SpareRespVO implements Serializable {
     @Schema(description = "查看状态")
     @DictFormat(DictTypeConstants.HY_STATE)
     private Integer hyState;
+    @Schema(description = "核验状态字符串")
+    private String hyStateStr;
     @Schema(description = "附件信息")
     private String fileIds;
     @Schema(description = "附件数量")

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/caxx/CaxxServiceImpl.java

@@ -163,6 +163,18 @@ public class CaxxServiceImpl implements CaxxService {
                 } else {
                     s.setFileNumber(0);
                 }
+
+                // 获取当前记录的会议状态字符串
+                String hyStateStr = s.getHyStateStr();
+                if ("0".equals(hyStateStr)) {
+                     s.setHyState(0);
+                }else if ((hyStateStr.contains("1") || hyStateStr.contains("2")) && hyStateStr.contains("0")) {
+                    s.setHyState(3);
+                }else if ((hyStateStr.contains("1") || hyStateStr.contains("2")) && !hyStateStr.contains("0")) {
+                    s.setHyState(4);
+                }else {
+                    s.setHyState(0);
+                }
             });
         }
         return new PageResult<>(page.getRecords(), page.getTotal());

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

@@ -87,7 +87,7 @@ public class DeliveryServiceImpl implements DeliveryService {
         // 单位信息
         if (ObjectUtils.isNotEmpty(createReqVO.getDwxxReqVO())) {
             if (ObjectUtils.isEmpty(createReqVO.getDwxxReqVO().getTyxydm())) {
-                CommonResult.error(null, "统一信用编码为空");
+                return CommonResult.error(null, "统一信用编码为空");
             }
             //根据统一信用编码----添加之前查询是否已经添加过该单位
             List<DwxxDO> tyxydm1 = dwxxMapper.selectList(

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

@@ -901,6 +901,12 @@ public class DwxxServiceImpl implements DwxxService {
     private void setAreaCodeBasedOnLevel(DeliveryPageReqVO pageReqVO, List<AreaLevelDO> allAreaLevels) {
         int areaLevel = pageReqVO.getAreaLevel();
         switch (areaLevel) {
+            case 0:
+                pageReqVO.setAreaSheng(null);
+                pageReqVO.setAreaShi(null);
+                pageReqVO.setAreaXian(null);
+                pageReqVO.setAreaCode(null);
+                break;
             case 1:
                 pageReqVO.setAreaSheng(pageReqVO.getAreaCode());
                 AreaLevelDO sheng = findAreaLevel(allAreaLevels, pageReqVO.getAreaCode());

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -158,7 +158,7 @@
             ck.KQFZR kqfzr,
             ck.LXDH lxdh,
             ifnull(t1.HYRY_NAME, '-') hyry_name,
-            t1.hy_state,
+            t1.hy_state hyStateStr,
             t1.rdyh_name,
             dk.PZXX file_ids
         from  DELIVERY_DWXX cd
@@ -169,7 +169,7 @@
                         KQ_ID,
                         count(CA_ID) yxcfnum,
                         HYRY_NAME,
-                        hy_state,
+                        LISTAGG(DISTINCT hy_state, ',') hy_state,
                         LISTAGG(DISTINCT rdyh_name, ',') rdyh_name
                 from DELIVERY_BANK
                 where  DELETED=0  and rdyh_id = #{pageReqVO.yhmc}