选定分页部分完成

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

@@ -47,6 +47,8 @@ public class SpareRespVO implements Serializable {
     private Integer yxcfnum;
     @Schema(description = "银行认定交收仓(个)")
     private Integer yhrdnum;
+    @Schema(description = "选定交收仓(个)")
+    private Integer xdnum;
     @Schema(description = "库区联系人")
     private String kqfzr;
     @Schema(description = "联系电话")

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

@@ -424,14 +424,212 @@
         </where>
         order by cc.KQID desc
      </select>
+
     <select id="getSelectSparePage"
                       resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
+    select   distinct
+            ck.id kqId,
+            cd.id deptId,
+            SUBSTRING_INDEX(cd.SHENG, ',', 1) SHENG,
+            SUBSTRING_INDEX(SUBSTRING_INDEX(cd.SHENG, ',', 2), ',', -1) SHI,
+            SUBSTRING_INDEX(cd.SHENG, ',', -1) XIAN,
+            cd.DWMC,
+            ck.KQMC,
+            ck.KQFZR kqfzr,
+            ck.LXDH lxdh,
+            ifnull(t1.yhrdnum, 0) yhrdnum,
+            ifnull(t2.xdnum, 0) xdnum,
+            t1.rdyh_name
+        from DELIVERY_DWXX cd
+        join DELIVERY_KQXX ck on ck.DWID=cd.id
+        join
+        (
+                select
+                        KQ_ID,
+                        count(CA_ID) yhrdnum,
+                        rdyh_name
+                from DELIVERY_BANK
+                where  DELETED=0 and HY_STATE=1
+                group by  KQ_ID
+                having  count(CA_ID)>0
+        )  t1 on t1.KQ_ID=ck.id
+       join
+        (
+                select
+                        KQ_ID,
+                        count(CA_ID) xdnum
+                from DELIVERY_USERS
+                where DELETED=0
+                group by  KQ_ID
+                having  count(CA_ID)>0
+        ) t2 on t2.KQ_ID=ck.id
+        <where>
+            cd.qyxz!='10' and cd.DELETED=0
+            <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
+                and cd.DWMC like #{pageReqVO.dwmc}
+            </if>
+            <if test="pageReqVO.kqmc!=null and pageReqVO.kqmc!=''">
+                and ck.KQMC like #{pageReqVO.kqmc}
+            </if>
+            <if test="pageReqVO.yhmc!=null and pageReqVO.yhmc!=''">
+                and bk.rdyh_id = #{pageReqVO.yhmc}
+            </if>
+            <if test="pageReqVO.shengCode!=null and pageReqVO.shengCode!=''">
+                and ck.SHENG = #{pageReqVO.shengCode}
+            </if>
+            <if test="pageReqVO.shiCode!=null and pageReqVO.shiCode!=''">
+                and ck.SHI = #{pageReqVO.shiCode}
+            </if>
+            <if test="pageReqVO.xianCode!=null and pageReqVO.xianCode!=''">
+                and ck.XIAN = #{pageReqVO.xianCode}
+            </if>
+        </where>
+        order by cd.id desc
     </select>
+
     <select id="getSelectPageForBank"
                      resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
+         select   distinct
+            ck.id kqId,
+            cd.id deptId,
+            SUBSTRING_INDEX(cd.SHENG, ',', 1) SHENG,
+            SUBSTRING_INDEX(SUBSTRING_INDEX(cd.SHENG, ',', 2), ',', -1) SHI,
+            SUBSTRING_INDEX(cd.SHENG, ',', -1) XIAN,
+            cd.DWMC,
+            ck.KQMC,
+            ck.KQFZR kqfzr,
+            ck.LXDH lxdh,
+            ifnull(t3.SYNDZZC, 0) syndzzc,
+            ifnull(t3.JLR, 0) jlr,
+            ifnull(t2.xdnum, 0) xdnum,
+            t1.rdyh_name
+        from DELIVERY_DWXX cd
+        join DELIVERY_KQXX ck on ck.DWID=cd.id
+        join
+        (
+                select
+                        KQ_ID,
+                        rdyh_name
+                from DELIVERY_BANK
+                where  DELETED=0 and HY_STATE=1
+                group by  KQ_ID
+                having  count(CA_ID)>0
+        )  t1 on t1.KQ_ID=ck.id
+       join
+        (
+                select
+                        KQ_ID,
+                        count(CA_ID) xdnum
+                from DELIVERY_USERS
+                where DELETED=0
+                group by  KQ_ID
+                having  count(CA_ID)>0
+        ) t2 on t2.KQ_ID=ck.id
+        left join
+        (
+                select
+                        cx.KQID,
+                        cx.id cwId,
+                        cx.SYNDZZC,
+                        cy.JLR
+                from   DELIVERY_CWXX  cx
+                JOIN
+                  (
+                   SELECT d.CWXX_ID,d.JLR
+                   FROM DELIVERY_CWXX_YEAR d
+                   INNER JOIN (
+                   SELECT CWXX_ID, MAX(CN) AS maxCN
+                   FROM  DELIVERY_CWXX_YEAR
+                   GROUP BY  CWXX_ID) m
+                   ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
+                   )  cy  on cx.id=cy.CWXX_ID
+        ) t3 on t3.KQID=ck.id
+        <where>
+            cd.qyxz!='10' and cd.DELETED=0
+            <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
+                and cd.DWMC like #{pageReqVO.dwmc}
+            </if>
+            <if test="pageReqVO.kqmc!=null and pageReqVO.kqmc!=''">
+                and ck.KQMC like #{pageReqVO.kqmc}
+            </if>
+            <if test="pageReqVO.yhmc!=null and pageReqVO.yhmc!=''">
+                and bk.rdyh_id = #{pageReqVO.yhmc}
+            </if>
+            <if test="pageReqVO.shengCode!=null and pageReqVO.shengCode!=''">
+                and ck.SHENG = #{pageReqVO.shengCode}
+            </if>
+            <if test="pageReqVO.shiCode!=null and pageReqVO.shiCode!=''">
+                and ck.SHI = #{pageReqVO.shiCode}
+            </if>
+            <if test="pageReqVO.xianCode!=null and pageReqVO.xianCode!=''">
+                and ck.XIAN = #{pageReqVO.xianCode}
+            </if>
+        </where>
+        order by cd.id desc
+
+
      </select>
+
     <select id="getSelectPageForSheng"
                       resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
+    select   distinct
+            ck.id kqId,
+            cd.id deptId,
+            SUBSTRING_INDEX(cd.SHENG, ',', 1) SHENG,
+            SUBSTRING_INDEX(SUBSTRING_INDEX(cd.SHENG, ',', 2), ',', -1) SHI,
+            SUBSTRING_INDEX(cd.SHENG, ',', -1) XIAN,
+            cd.DWMC,
+            ck.KQMC,
+            ck.KQFZR kqfzr,
+            ck.LXDH lxdh,
+            ifnull(t1.yhrdnum, 0) yhrdnum,
+            ifnull(t2.xdnum, 0) xdnum,
+            t1.rdyh_name
+        from DELIVERY_DWXX cd
+        join DELIVERY_KQXX ck on ck.DWID=cd.id
+        join
+        (
+                select
+                        KQ_ID,
+                        count(CA_ID) yhrdnum,
+                        rdyh_name
+                from DELIVERY_BANK
+                where  DELETED=0 and HY_STATE=1
+                group by  KQ_ID
+                having  count(CA_ID)>0
+        )  t1 on t1.KQ_ID=ck.id
+       join
+        (
+                select
+                        KQ_ID,
+                        count(CA_ID) xdnum
+                from DELIVERY_USERS
+                where DELETED=0
+                group by  KQ_ID
+                having  count(CA_ID)>0
+        ) t2 on t2.KQ_ID=ck.id
+        <where>
+            cd.qyxz!='10' and cd.DELETED=0
+            <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
+                and cd.DWMC like #{pageReqVO.dwmc}
+            </if>
+            <if test="pageReqVO.kqmc!=null and pageReqVO.kqmc!=''">
+                and ck.KQMC like #{pageReqVO.kqmc}
+            </if>
+            <if test="pageReqVO.yhmc!=null and pageReqVO.yhmc!=''">
+                and bk.rdyh_id = #{pageReqVO.yhmc}
+            </if>
+            <if test="pageReqVO.shengCode!=null and pageReqVO.shengCode!=''">
+                and ck.SHENG = #{pageReqVO.shengCode}
+            </if>
+            <if test="pageReqVO.shiCode!=null and pageReqVO.shiCode!=''">
+                and ck.SHI = #{pageReqVO.shiCode}
+            </if>
+            <if test="pageReqVO.xianCode!=null and pageReqVO.xianCode!=''">
+                and ck.XIAN = #{pageReqVO.xianCode}
+            </if>
+        </where>
+        order by cd.id desc
     </select>