修改选择分页防止空仓数量为负数；修改查看选择与备选仓房列表

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

@@ -61,4 +61,6 @@ public class DeliveryPageReqVO extends PageParam {
     private String areaSheng;
     @Schema(description = "所选区县")
     private String areaXian;
+    @Schema(description = "银行名称")
+    private String yhmc;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/bank/BankMapper.java

@@ -12,6 +12,7 @@ import com.unis.module.coding.controller.admin.delivery.vo.StoreRespVO;
 import com.unis.module.coding.dal.dataobject.bank.BankDO;
 import com.unis.module.coding.dal.dataobject.province.ProvinceDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -35,7 +36,7 @@ public interface BankMapper extends BaseMapperX<BankDO> {
                 .likeIfPresent(BankDO::getRdyhName, reqVO.getRdyhName())
                 .orderByDesc(BankDO::getId));
     }
-    List<StoreRespVO> getStoreListForBank( Long  kqId);
+    List<StoreRespVO> getStoreListForBank(@Param("kqId") Long  kqId, @Param("yhmc")String yhmc);
 
     default int deleteListByKqIdAndCaIdsAndBank(Long  kqId, List<Long> caIds,String bankType) {
         return delete(

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

@@ -237,6 +237,11 @@ public class DwxxServiceImpl implements DwxxService {
                 String[] items = roleIdsReal.split(",");
                 List<String> roleIdList = Arrays.asList(items);
                 if (roleIdList.contains(RoleIdEnum.BANK_ADMIN.getRoleId())) {
+                    String bankType = loginUser.getInfo().get("bankType");
+                    if (StringUtils.isBlank(bankType)) {
+                        throw exception(ERROR, "当前银行用户不存在银行信息");
+                    }
+                    pageReqVO.setYhmc(bankType);
                     page = dwxxMapper.selectWrapperPageForBank(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
                 } else {
                     page = dwxxMapper.selectWrapperPageForSheng(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
@@ -312,7 +317,7 @@ public class DwxxServiceImpl implements DwxxService {
                     }
                     if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
                         List<StoreRespVO> storeListForBank = provinceMapper.getStoreListForProvince(pageReqVO.getKqId(), 1);
-                        List<StoreRespVO> storeListSelelct = bankMapper.getStoreListForBank(pageReqVO.getKqId());
+                        List<StoreRespVO> storeListSelelct = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
                         if (!ObjectUtils.isEmpty(storeListForBank)) {
                             if (!ObjectUtils.isEmpty(storeListSelelct)) {
                                 List<Long> idsExist = storeListSelelct.stream().map(StoreRespVO::getId).collect(Collectors.toList());
@@ -323,7 +328,7 @@ public class DwxxServiceImpl implements DwxxService {
                             return storeListForBank;
                         }
                     } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeListForBank = bankMapper.getStoreListForBank(pageReqVO.getKqId());
+                        List<StoreRespVO> storeListForBank = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
                         return storeListForBank;
                     } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
                         List<StoreRespVO> storeRespVOS = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), bankType);
@@ -349,7 +354,6 @@ public class DwxxServiceImpl implements DwxxService {
                             }
                             return storeListForProvice;
                         }
-
                     } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
                         List<StoreRespVO> storeListForProvince = provinceMapper.getStoreListForProvince(pageReqVO.getKqId(), 0);
                         return storeListForProvince;

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/bank/BankMapper.xml

@@ -21,7 +21,7 @@
                 cc.yxcf
         from  DELIVERY_CAXX cc
         join  DELIVERY_BANK bk on bk.CA_ID=cc.ID
-        where bk.KQ_ID=#{kqId} and   bk.deleted=0
+        where bk.KQ_ID=#{kqId} and   bk.deleted=0  and bk.rdyh_id = #{pageReqVO.yhmc}
         order by bk.KQ_ID desc
     </select>
 </mapper>

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -13,12 +13,12 @@
             cd.DWMC,
             ck.KQMC,
             t1.sjcrNum,
-            t1.cfnum- ifnull(t2.yxcfnum, 0)  cfnum,
+            ifnull(t1.cfnum, 0) cfnum,
             ifnull(t2.yxcfnum, 0) yxcfnum,
             ck.xzqhdm
         from  CODING_DWXX cd
         left join coding_kqxx ck on ck.DWID=cd.id
-        inner join
+        left join
         (
                 select
                         cf.BASE_KQXX_ID,
@@ -27,11 +27,12 @@
                         ck.xzqhdm
                 from
                         CODING_CAXX cc
-                inner join CODING_FMXX cf on cc.id=cf.BASE_CAXX_ID
-                inner join CODING_KQXX ck on cc.KQID=ck.id
+                join CODING_FMXX cf on cc.id=cf.BASE_CAXX_ID
+                join CODING_KQXX ck on cc.KQID=ck.id
                 <where>
                         cf.deleted=0
                     and cf.lsxz='000'
+                    AND NOT EXISTS (SELECT 1  from  DELIVERY_CAXX dc   where dc.DELETED=0 AND  cc.id=dc.id)
                     <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
                         and cc.CFLX=#{pageReqVO.cflx}
                     </if>
@@ -49,7 +50,6 @@
                     </if>
                 </where>
                 group by cf.BASE_KQXX_ID
-                having  count(cf.BASE_CAXX_ID)>0
         ) t1 on t1.BASE_KQXX_ID=ck.id
         left join
         (
@@ -57,10 +57,9 @@
                 cc.KQID,
                 count(cc.id) yxcfnum,
                 ck.xzqhdm
-        from DELIVERY_DWXX cd
-        inner join DELIVERY_KQXX ck on ck.DWID=cd.id
-        inner join DELIVERY_CAXX cc on cc.KQID=ck.id
-        where cd.DELETED=0 and cc.yxcf=1 and ck.deleted=0 and  cc.deleted=0
+        from  DELIVERY_KQXX ck
+        join  DELIVERY_CAXX cc on cc.KQID=ck.id
+        where cc.yxcf=1 and ck.deleted=0 and  cc.deleted=0
         group by ck.id
         ) t2 on t2.KQID=ck.id
         <where>
@@ -97,19 +96,19 @@
             cd.DWMC,
             ck.KQMC,
             t1.sjcrNum,
-            t1.cfnum- ifnull(t2.yxcfnum, 0) cfnum,
+            ifnull(t1.cfnum, 0) cfnum,
             ifnull(t2.yxcfnum, 0) yxcfnum
         from  DELIVERY_DWXX cd
         left join DELIVERY_KQXX ck on ck.DWID=cd.id
-        inner join
+        left join
         (
                 select
                         cc.KQID,
                         sum(cc.SJCR) sjcrNum,
                         count(cc.ID) cfnum
                 from DELIVERY_CAXX cc
-                inner join DELIVERY_KQXX ck on cc.KQID=ck.id
                 <where>
+                     NOT EXISTS (SELECT 1  from  DELIVERY_PROVINCE dp   where dp.DELETED=0 AND  cc.id=dp.CA_ID)
                     <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
                         and cc.CFLX=#{pageReqVO.cflx}
                     </if>
@@ -127,7 +126,6 @@
                     </if>
                 </where>
                 group by cc.KQID
-                having  count(cc.ID)>0
         ) t1 on t1.KQID=ck.id
         left join
         (
@@ -178,7 +176,7 @@
             cd.DWMC,
             ck.KQMC,
             t1.sjcrNum,
-            t1.cfnum-ifnull(t3.yxcfnum, 0) cfnum,
+            ifnull(t1.cfnum, 0) cfnum,
             ifnull(t3.yxcfnum, 0) yxcfnum,
             ifnull(t2.SYNDZZC, 0) zzc,
             ifnull(t2.JLR, 0) sndjlr,
@@ -186,7 +184,7 @@
             ck.LXDH lxdh
         from  DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
-        join
+        left join
         (
                 select
                         pe.KQ_ID,
@@ -195,7 +193,8 @@
                 from  DELIVERY_CAXX cc
                 join DELIVERY_PROVINCE  pe  on cc.id=pe.CA_ID
                 <where>
-                    pe.HY_STATE=1   and    pe.DELETED=0
+                    pe.HY_STATE=1  and  pe.DELETED=0
+                    AND NOT EXISTS (SELECT 1  from  DELIVERY_BANK bk   where bk.DELETED=0 AND  cc.id=bk.CA_ID )
                     <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
                         and cc.CFLX=#{pageReqVO.cflx}
                     </if>
@@ -213,7 +212,6 @@
                     </if>
                 </where>
                 group by pe.KQ_ID
-                having   count(cc.id)>0
         ) t1 on t1.KQ_ID=ck.id
         left join
         (
@@ -237,11 +235,14 @@
         left join
         (
         select
-                bk.KQ_ID,
-                count( distinct bk.CA_ID) yxcfnum
-        from  DELIVERY_BANK  bk
-        where bk.DELETED=0
-        group by bk.KQ_ID
+                KQ_ID,
+                count( distinct CA_ID) yxcfnum
+        from  DELIVERY_BANK
+        where DELETED=0
+        <if test="pageReqVO.yhmc!=null and pageReqVO.yhmc!=''">
+             and rdyh_id = #{pageReqVO.yhmc}
+        </if>
+        group by KQ_ID
         ) t3 on t3.KQ_ID=ck.id
         <where>
             cd.qyxz!='10' and cd.DELETED=0