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

delivery-framework/delivery-common/src/main/java/com/unis/framework/common/util/orderNum/OrderNumberUtil.java

@@ -0,0 +1,80 @@
+package com.unis.framework.common.util.orderNum;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author qingsong.han
+ * @description: 生成单号
+ * @create 2024-05-21 14:18
+ */
+public class OrderNumberUtil {
+
+    /**
+     * int 定长拼接-后缀顺序号
+     *
+     * @param length 总长度
+     * @param param  参数
+     * @return 参数前补0
+     */
+    public static String integerToString(int length, int param) {
+        return String.format("%0" + length + "d", param);
+    }
+
+    /**
+     * 主方法
+     * 调用生成完整规则序号: 尾数+1的编号
+     * @param length 位数必须大于0
+     * @param xh 字符串
+     * @return 尾数+1的编号
+     */
+    public synchronized static String initNum(int length, String xh) {
+        // 初始化
+        int num = 1;
+        if (!StringUtils.isEmpty(xh)) {
+            String substring = xh.substring(xh.length() - length);
+            int i = Integer.parseInt(substring);
+            if (i < maxNum(length))
+                num += i;
+        }
+        return integerToString(length, num);
+    }
+
+    /**
+     * 获取int位数的最大值:如6位->999999
+     * @param length int位数
+     * @return int
+     */
+    private static int maxNum(int length) {
+        if (0 < length) {
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < length; i++) {
+                builder.append(9);
+            }
+            return Integer.parseInt(builder.toString());
+        }
+        return 0;
+    }
+
+    public synchronized static String generateCode(List<String> stringList) {
+        StringBuilder code = new StringBuilder();
+
+        if (stringList != null && !stringList.isEmpty()) {
+            for (String string : stringList) {
+                code.append(string);
+            }
+        }
+        return code.toString();
+    }
+//    public static void main(String[] args) {
+//        System.out.println(frontData("JH",4, 2));
+//        System.out.println("-->" + maxNum(3));
+//        System.out.println("-->" + initNum("AJXXSJG", 3, "AJXXSJG20240622001"));
+//        System.out.println("-->" + initNum("AJXXSJG", 3, ""));
+//    }
+
+}

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/controller/admin/delivery/vo/StoreRespVO.java

@@ -43,5 +43,5 @@ public class StoreRespVO {
     private String mobile;
 
     @Schema(description = "储存状态")
-    private String cczt;
+    private Integer cczt;
 }

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/caxx/CaxxServiceImpl.java

@@ -141,6 +141,11 @@ public class CaxxServiceImpl implements CaxxService {
                 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 = caxxMapper.selectWrapperPageForBank(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
                 } else {
                     page = caxxMapper.selectWrapperPageForSheng(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);

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

@@ -223,6 +223,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);
@@ -298,7 +303,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());
@@ -309,7 +314,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);
@@ -335,7 +340,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/caxx/CaxxMapper.xml

@@ -170,7 +170,7 @@
                         hy_state,
                         LISTAGG(DISTINCT rdyh_name, ',') rdyh_name
                 from DELIVERY_BANK
-                where  DELETED=0
+                where  DELETED=0  and rdyh_id = #{pageReqVO.yhmc}
                 group by  KQ_ID
                 having  count(CA_ID)>0
         ) t1 on t1.KQ_ID=ck.id
@@ -202,12 +202,14 @@
         #{id}
     </foreach>
     </delete>
+
     <delete id="deleteListByKqId">
      DELETE FROM DELIVERY_CAXX  where  KQID = #{kqId}
     </delete>
+
     <select id="getIdentifySparePage"
         resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
-       select   distinct
+       select
             ck.id kqId,
             cd.id deptId,
             ck.sheng_name SHENG,
@@ -267,9 +269,10 @@
         </where>
         order by cd.id desc
     </select>
+
     <select id="getIdentifyPageForBank"
                 resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
-     select distinct
+     select
             ck.id kqId,
             cd.id deptId,
             t2.cwId,
@@ -286,7 +289,6 @@
             t1.rdyh_name
         from DELIVERY_DWXX cd
         join DELIVERY_KQXX ck on ck.DWID=cd.id
-        join DELIVERY_BANK  bk  on  bk.KQ_ID=ck.id
         join
         (
                 select
@@ -318,8 +320,7 @@
                    )  cy  on cx.id=cy.CWXX_ID
         ) t2 on t2.DEPT_ID=cd.id
         <where>
-            cd.qyxz!='10'
-            and cd.DELETED=0  and bk.DELETED=0 and bk.HY_STATE=1
+            cd.qyxz!='10'and cd.DELETED=0
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
                 and cd.DWMC like #{pageReqVO.dwmc}
             </if>
@@ -338,6 +339,7 @@
         </where>
         order by cd.id desc
     </select>
+
     <select id="getIdentifyPageForSheng"
                 resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
      select   distinct
@@ -471,7 +473,7 @@
 
     <select id="getSelectSparePage"
                       resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
-    select   distinct
+    select
             ck.id kqId,
             cd.id deptId,
             ck.sheng_name SHENG,
@@ -536,7 +538,7 @@
 
     <select id="getSelectPageForBank"
                      resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
-         select   distinct
+         select
             ck.id kqId,
             cd.id deptId,
             ck.sheng_name SHENG,
@@ -622,7 +624,7 @@
 
     <select id="getSelectPageForSheng"
                       resultType="com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO">
-    select   distinct
+    select
             ck.id kqId,
             cd.id deptId,
             ck.sheng_name SHENG,

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

@@ -12,13 +12,13 @@
             cd.TYXYDM,
             cd.DWMC,
             ck.KQMC,
-            t1.sjcrNum,
-            t1.cfnum- ifnull(t2.yxcfnum, 0)  cfnum,
+            ifnull(t1.sjcrNum, 0) sjcrNum,
+            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,16 +57,15 @@
                 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>
             cd.bz is null
             and cd.qyxz!='10'
-            and cd.DELETED=0
+            and cd.DELETED=0   and (t1.cfnum!=0   or  t2.yxcfnum!=0)
             <if test="pageReqVO.areaCode!=null and pageReqVO.areaCode!=''">
                 and ck.xzqhdm like #{pageReqVO.areaCode}
             </if>
@@ -96,20 +95,20 @@
             cd.TYXYDM,
             cd.DWMC,
             ck.KQMC,
-            t1.sjcrNum,
-            t1.cfnum- ifnull(t2.yxcfnum, 0) cfnum,
+            ifnull(t1.sjcrNum, 0) sjcrNum,
+            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
         (
@@ -177,8 +175,8 @@
             cd.TYXYDM,
             cd.DWMC,
             ck.KQMC,
-            t1.sjcrNum,
-            t1.cfnum-ifnull(t3.yxcfnum, 0) cfnum,
+            ifnull(t1.sjcrNum, 0) sjcrNum,
+            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

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

@@ -31,4 +31,6 @@ public interface DictTypeConstants {
      * 库存性质
      */
     String HY_STATE = "hy_state";
+
+    String BANK_TYPE = "bank_type"; //银行类型
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/user/vo/user/UserRespVO.java

@@ -75,4 +75,21 @@ public class UserRespVO{
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
     private LocalDateTime createTime;
 
+    @Schema(description = "省code")
+    @ExcelProperty("省")
+    private String shengCode;
+
+    @Schema(description = "市code")
+    @ExcelProperty("市")
+    private String shiCode;
+
+    @Schema(description = "县code")
+    @ExcelProperty("县")
+    private String xianCode;
+
+    @Schema(description = "银行类型")
+    @ExcelProperty(value = "银行类型", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.BANK_TYPE)
+    private String bankType;
+
 }