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/delivery/vo/StorePageReqVO.java

@@ -38,4 +38,6 @@ public class StorePageReqVO extends PageParam {
     private Integer cfStart;
     @Schema(description = "仓房仓容end")
     private Integer cfEnd;
+    @Schema(description = "类型：省0,银行1")
+    private  Integer type;
 }

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

@@ -1,5 +1,7 @@
 package com.unis.module.coding.controller.admin.delivery.vo;
 
+import com.unis.framework.excel.core.annotations.DictFormat;
+import com.unis.module.system.enums.DictTypeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -43,5 +45,6 @@ public class StoreRespVO {
     private String mobile;
 
     @Schema(description = "储存状态")
+    @DictFormat(DictTypeConstants.CC_TYPE)
     private Integer cczt;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/province/ProvinceMapper.java

@@ -8,6 +8,7 @@ import com.unis.framework.common.pojo.PageResult;
 import com.unis.framework.common.util.object.ObjectUtils;
 import com.unis.framework.mybatis.core.mapper.BaseMapperX;
 import com.unis.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.unis.module.coding.controller.admin.delivery.vo.StorePageReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.StoreRespVO;
 import com.unis.module.coding.controller.admin.province.vo.ProvincePageReqVO;
 import com.unis.module.coding.dal.dataobject.bank.BankDO;
@@ -68,8 +69,9 @@ public interface ProvinceMapper extends BaseMapperX<ProvinceDO> {
 
         );
     }
-    List<StoreRespVO> getStoreListForProvince(@Param("kqId") Long  kqId,@Param("type")Integer type);
+    List<StoreRespVO> getStoreListForProvinceOnly(@Param("kqId") Long  kqId,@Param("type")Integer type);
 
+    List<StoreRespVO> getStoreListForProvince(@Param("pageReqVO") StorePageReqVO pageReqVO);
     default int deleteListByKqIds(List<Long> kqIds) {
         return delete(
                 new LambdaUpdateWrapper<ProvinceDO>()

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

@@ -55,6 +55,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -272,6 +274,12 @@ public class DwxxServiceImpl implements DwxxService {
             } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
                 List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
                 if (!ObjectUtils.isEmpty(caxxDOS)) {
+                    caxxDOS.stream().forEach(s->{
+                        if (s.getSjcr()!=null) {
+                            BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
+                            s.setSjcr(truncatedNumber);
+                        }
+                    });
                     List<StoreRespVO> selectedStoreSForNation = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
                     return selectedStoreSForNation;
                 }
@@ -283,7 +291,7 @@ public class DwxxServiceImpl implements DwxxService {
                 return storeRespVOS;
             } else {
                 //国家查看省已选仓房列表
-                List<StoreRespVO> storeListForProvince = provinceMapper.getStoreListForProvince(pageReqVO.getKqId(), 0);
+                List<StoreRespVO> storeListForProvince = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
                 return storeListForProvince;
             }
         }
@@ -302,7 +310,8 @@ public class DwxxServiceImpl implements DwxxService {
                         throw exception(ERROR, "当前银行用户不存在银行信息");
                     }
                     if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeListForBank = provinceMapper.getStoreListForProvince(pageReqVO.getKqId(), 1);
+                        pageReqVO.setType(1);
+                        List<StoreRespVO> storeListForBank = provinceMapper.getStoreListForProvince(pageReqVO);
                         List<StoreRespVO> storeListSelelct = bankMapper.getStoreListForBank(pageReqVO.getKqId(),bankType);
                         if (!ObjectUtils.isEmpty(storeListForBank)) {
                             if (!ObjectUtils.isEmpty(storeListSelelct)) {
@@ -326,7 +335,7 @@ public class DwxxServiceImpl implements DwxxService {
                 } else {// 省已选
                     if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
                         List<CaxxDO> caxxDOS = caxxMapper.selectList(pageReqVO);
-                        List<StoreRespVO> storeListSelect = provinceMapper.getStoreListForProvince(pageReqVO.getKqId(), 0);
+                        List<StoreRespVO> storeListSelect = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
                         List<StoreRespVO> storeListForProvice = new ArrayList<>();
                         if (!ObjectUtils.isEmpty(caxxDOS)) {
                             if (!ObjectUtils.isEmpty(storeListSelect)) {
@@ -336,12 +345,18 @@ public class DwxxServiceImpl implements DwxxService {
                                 }
                             }
                             if (!ObjectUtils.isEmpty(caxxDOS)) {
+                                caxxDOS.stream().forEach(s->{
+                                    if (s.getSjcr()!=null) {
+                                        BigDecimal truncatedNumber = s.getSjcr().setScale(0, RoundingMode.DOWN);
+                                        s.setSjcr(truncatedNumber);
+                                    }
+                                });
                                 storeListForProvice = BeanUtils.toBean(caxxDOS, StoreRespVO.class);
                             }
                             return storeListForProvice;
                         }
                     } else if (YXZT.SELECTED.getCode().equals(pageReqVO.getYxcf()) || YXZT.OPTION.getCode().equals(pageReqVO.getYxcf())) {
-                        List<StoreRespVO> storeListForProvince = provinceMapper.getStoreListForProvince(pageReqVO.getKqId(), 0);
+                        List<StoreRespVO> storeListForProvince = provinceMapper.getStoreListForProvinceOnly(pageReqVO.getKqId(), 0);
                         return storeListForProvince;
                     } else if (YXZT.IDENTIFY.getCode().equals(pageReqVO.getYxcf())) {
                         List<StoreRespVO> storeRespVOS = caxxMapper.selectListForIdentify(pageReqVO.getKqId(), pageReqVO.getYhmc());

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

@@ -17,11 +17,11 @@
                 cc.CAMC,
                 cc.CFLX,
                 cc.CAZT,
-                cc.SJCR,
+                TRUNC(cc.SJCR) sjcr,
                 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  and bk.rdyh_id = #{pageReqVO.yhmc}
+        where bk.KQ_ID=#{kqId} and   bk.deleted=0  and bk.rdyh_id = #{yhmc}
         order by bk.KQ_ID desc
     </select>
 </mapper>

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

@@ -410,7 +410,7 @@
                 cc.CAMC,
                 cc.CFLX,
                 cc.CAZT,
-                cc.SJCR,
+                TRUNC(cc.SJCR) sjcr,
                 LISTAGG(DISTINCT bk.RDYH_NAME, ',') rdyh_name
         from DELIVERY_CAXX cc
         join DELIVERY_BANK bk on cc.id=bk.CA_ID
@@ -435,7 +435,7 @@
                 cc.CAMC,
                 cc.CFLX,
                 cc.CAZT,
-                cc.SJCR,
+                TRUNC(cc.SJCR) sjcr,
                 t1.RDYH_NAME,
                 t1.CCZT,
                 t1.NICKNAME,

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

@@ -12,7 +12,7 @@
             cd.TYXYDM,
             cd.DWMC,
             ck.KQMC,
-            ifnull(t1.sjcrNum, 0) sjcrNum,
+            TRUNC(ifnull(t1.sjcrNum, 0)) sjcrNum,
             ifnull(t1.cfnum, 0) cfnum,
             ifnull(t2.yxcfnum, 0) yxcfnum,
             ck.xzqhdm
@@ -95,7 +95,7 @@
             cd.TYXYDM,
             cd.DWMC,
             ck.KQMC,
-            ifnull(t1.sjcrNum, 0) sjcrNum,
+            TRUNC(ifnull(t1.sjcrNum, 0)) sjcrNum,
             ifnull(t1.cfnum, 0) cfnum,
             ifnull(t2.yxcfnum, 0) yxcfnum
         from  DELIVERY_DWXX cd
@@ -175,7 +175,7 @@
             cd.TYXYDM,
             cd.DWMC,
             ck.KQMC,
-            ifnull(t1.sjcrNum, 0) sjcrNum,
+            TRUNC(ifnull(t1.sjcrNum, 0)) sjcrNum,
             ifnull(t1.cfnum, 0) cfnum,
             ifnull(t3.yxcfnum, 0) yxcfnum,
             ifnull(t2.SYNDZZC, 0) zzc,
@@ -276,8 +276,9 @@
                 cc.ID  ,
                 cc.KQMC,
                 cc.CAMC,
+
                 cc.CFLX,
-                cc.CAZT,
+                TRUNC(cc.SJCR)  sjcr,
                 cc.SJCR
         from  CODING_CAXX cc
         join CODING_FMXX cf on cc.id=cf.BASE_CAXX_ID

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/province/ProvinceMapper.xml

@@ -17,13 +17,13 @@
                 cc.CAMC,
                 cc.CFLX,
                 cc.CAZT,
-                cc.SJCR,
+                TRUNC(cc.SJCR) sjcr,
                 cc.yxcf
         from  DELIVERY_CAXX cc
         join  DELIVERY_PROVINCE pe on pe.CA_ID=cc.ID
         <where>
-            and pe.KQ_ID=#{kqId}   and pe.deleted=0
-             <if test="type!=null  and type==1">
+            and pe.KQ_ID=#{pageReqVO.kqId}   and pe.deleted=0
+             <if test="pageReqVO.type!=null  and pageReqVO.type==1">
                 and pe.HY_STATE=1
             </if>
             <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
@@ -44,5 +44,25 @@
         </where>
         order by pe.KQ_ID desc
     </select>
+    <select id="getStoreListForProvinceOnly"
+                     resultType="com.unis.module.coding.controller.admin.delivery.vo.StoreRespVO">
+  select
+                cc.ID  ,
+                cc.KQMC,
+                cc.CAMC,
+                cc.CFLX,
+                cc.CAZT,
+                TRUNC(cc.SJCR)  sjcr,
+                cc.yxcf
+        from  DELIVERY_CAXX cc
+        join  DELIVERY_PROVINCE pe on pe.CA_ID=cc.ID
+        <where>
+            and pe.KQ_ID=#{kqId}   and pe.deleted=0
+             <if test="type!=null  and type==1">
+                and pe.HY_STATE=1
+            </if>
+        </where>
+        order by pe.KQ_ID desc
+    </select>
 
 </mapper>

delivery-module-system/delivery-module-system-api/src/main/java/com/unis/module/system/enums/DictTypeConstants.java

@@ -27,10 +27,9 @@ public interface DictTypeConstants {
     String SYSTEM_ROLE_TYPE = "system_role_type"; // 短信接收状态
 
     String SYSTEM_AREA_DEEP = "system_area_deep"; // 地区级别：0 省 1 市 2 区县
-    /**
-     * 库存性质
-     */
-    String HY_STATE = "hy_state";
+
+    String HY_STATE = "hy_state";//核验状态
 
     String BANK_TYPE = "bank_type"; //银行类型
+    String CC_TYPE ="cczt";//储存状态
 }