Merge branch 'master' of http://101.36.160.140:21044/delivery-warehouse-java/delivery-depot-admin into liuj_pc_dev

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

@@ -32,7 +32,7 @@ public class kqxxVo {
     @Schema(description = "仓房数量")
     private Integer cfsl;
 
-    @Schema(description = "仓房数量")
+    @Schema(description = "仓容总量")
     private BigDecimal crzl;
 
     /*@Schema(description = "油罐数量")

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

@@ -168,11 +168,13 @@ public class KshzsServiceImpl implements KshzsService{
     public List<cwxxVo> selectCwxxList(paramVo paramVo) {
         List<cwxxVo> list = new ArrayList<>();
         cwxxVo vo = kshzsMapper.selectCwxxInfo(paramVo);
-        List<CwxxYearSaveReqVO> yearList = kshzsMapper.selectCwxxYearList(vo.getCwxxid());
-        if(yearList != null && yearList.size()>0){
-            vo.setCwxxYearList(yearList);
+        if(vo != null){
+            List<CwxxYearSaveReqVO> yearList = kshzsMapper.selectCwxxYearList(vo.getCwxxid());
+            if(yearList != null && yearList.size()>0){
+                vo.setCwxxYearList(yearList);
+            }
+            list.add(vo);
         }
-        list.add(vo);
         return list;
     }
 

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

@@ -87,7 +87,7 @@
             ck.LXDH lxdh,
             ifnull(t1.HYRY_NAME, '-') hyry_name,
             t1.hy_state,
-            t1.file_ids
+            dk.file_ids
         from DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
         join
@@ -122,6 +122,7 @@
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
         ) t2 on t2.DEPT_ID=cd.id
+        left join DELIVERY_DK dk on dk.KQ_ID = ck.id
         <where>
             cd.qyxz!='10' and cd.DELETED=0
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/kshzs/KshzsMapper.xml

@@ -102,7 +102,7 @@
 
     <select id="queryKqInfo" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="com.unis.module.coding.controller.admin.kshzs.vo.kqxxVo">
         SELECT
-         id kqid,kqdm,ssfrqy qymc,shxydm tyshxydm,resid ljdz from DELIVERY_KQXX
+         id kqid,kqdm,kqmc,ssfrqy qymc,shxydm tyshxydm,resid ljdz
         FROM DELIVERY_KQXX
         <where>
             <if test="kqid != null and kqid != ''">