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-api/src/main/java/com/unis/module/core/enums/project/DeliveryBxzt.java

@@ -0,0 +1,39 @@
+package com.unis.module.core.enums.project;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @program: delivery-depot-admin
+ * @author: duhuajie
+ * @create: 2025-02-11
+ * @description: 备选状态:
+ * 1. 未选择:0:省未选择
+ * 2. 未核验:1:省已选择
+ * 3. 备选:省核验通过
+ * 4. 被认定:银行核验通过
+ * 5. 被选定:贷款人选定
+ * 6. 核验不通过:
+ */
+@Getter
+@AllArgsConstructor
+public enum DeliveryBxzt {
+
+    UNSELECTED(0,"未选择"),
+    UNVERIFIED(1,"未核验"),
+    CHOICE(2,"备选"),
+    RECOGNIZED(3,"被认定"),
+    SELECTED(4,"被选定"),
+    UNVERIFIED_FAIL(5,"省核验不通过"),
+    BANK_UNVERIFIED_FAIL(6,"银行核验不通过"),
+
+    ;
+    /**
+     * 字典编码
+     */
+    private final Integer code;
+    /**
+     * 字典描述
+     */
+    private final String name;
+}

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

@@ -41,4 +41,7 @@ public class TaskCaxxRespVO {
     @Schema(description = "委托保管参考价(元/吨/月)")
     private Integer wtbgckj;
 
+    @Schema(description = "核验状态(0:待查验,1:查验通过,2:查验不通过)")
+    private Integer hyState;
+
 }

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

@@ -76,4 +76,7 @@ public class TaskPageReqVO extends PageParam {
     @Schema(description = "出入库类型(0:出库,1:入库)")
     private Integer crklx;
 
+    @Schema(description = "仓房名称")
+    private String cfmc;
+
 }

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

@@ -51,6 +51,12 @@ public class TaskRespVO {
     @Schema(description = "核验数量")
     private Integer hyNum;
 
+    @Schema(description = "核验通过数量")
+    private Integer hytgNum;
+
+    @Schema(description = "核验不通过数量")
+    private Integer hybtgNum;
+
     @Schema(description = "社会信用代码")
     private String shxydm;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/caxx/CaxxDO.java

@@ -1,11 +1,9 @@
 package com.unis.module.coding.dal.dataobject.caxx;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.unis.framework.mybatis.core.dataobject.BaseDO;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -125,4 +123,7 @@ public class CaxxDO extends BaseDO {
      * 客户身份证号(社会统一信用代码)
      */
     private String khbh;
+
+    /** 备选状态 */
+    private Integer bxzt;
 }

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

@@ -10,7 +10,6 @@ import com.unis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.unis.module.coding.controller.admin.bank.vo.BankPageReqVO;
 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;
 
@@ -67,7 +66,7 @@ public interface BankMapper extends BaseMapperX<BankDO> {
         );
     }
 
-    default void updateByKqId(BankDO bankDO, Long kqId){
-        update(bankDO, new LambdaQueryWrapperX<BankDO>().eq(BankDO::getKqId,kqId));
+    default void updateByKqId(BankDO bankDO, Long kqId, List<Long> caIds){
+        update(bankDO, new LambdaQueryWrapperX<BankDO>().eq(BankDO::getKqId,kqId).inIfPresent(BankDO::getCaId, caIds));
     }
 }

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

@@ -1,18 +1,13 @@
 package com.unis.module.coding.dal.mysql.province;
 
-import java.util.*;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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;
-import com.unis.module.coding.dal.dataobject.caxx.CaxxDO;
 import com.unis.module.coding.dal.dataobject.province.ProvinceDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -40,8 +35,8 @@ public interface ProvinceMapper extends BaseMapperX<ProvinceDO> {
                 .orderByDesc(ProvinceDO::getId));
     }
 
-    default void updateByKqId(ProvinceDO provinceDO,Long kqId){
-        update(provinceDO, new LambdaQueryWrapperX<ProvinceDO>().eq(ProvinceDO::getKqId,kqId));
+    default void updateByKqId(ProvinceDO provinceDO,Long kqId, List<Long> caIds){
+        update(provinceDO, new LambdaQueryWrapperX<ProvinceDO>().eq(ProvinceDO::getKqId,kqId).inIfPresent(ProvinceDO::getCaId, caIds));
     }
     default List<ProvinceDO> selectListByKqId(Long  kqId) {
         List<ProvinceDO> provinceList = selectList(

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -11,6 +11,7 @@ import com.unis.framework.security.core.LoginUser;
 import com.unis.framework.security.core.util.SecurityFrameworkUtils;
 import com.unis.module.coding.controller.admin.task.vo.*;
 import com.unis.module.coding.dal.dataobject.bank.BankDO;
+import com.unis.module.coding.dal.dataobject.caxx.CaxxDO;
 import com.unis.module.coding.dal.dataobject.cwxx.CwxxDO;
 import com.unis.module.coding.dal.dataobject.cwxxyear.CwxxYearDO;
 import com.unis.module.coding.dal.dataobject.dk.DkDO;
@@ -19,6 +20,7 @@ import com.unis.module.coding.dal.dataobject.kqxx.KqxxDO;
 import com.unis.module.coding.dal.dataobject.province.ProvinceDO;
 import com.unis.module.coding.dal.dataobject.users.UsersDO;
 import com.unis.module.coding.dal.mysql.bank.BankMapper;
+import com.unis.module.coding.dal.mysql.caxx.CaxxMapper;
 import com.unis.module.coding.dal.mysql.cwxx.CwxxMapper;
 import com.unis.module.coding.dal.mysql.cwxxyear.CwxxYearMapper;
 import com.unis.module.coding.dal.mysql.dk.DkMapper;
@@ -27,6 +29,7 @@ import com.unis.module.coding.dal.mysql.kqxx.KqxxMapper;
 import com.unis.module.coding.dal.mysql.province.ProvinceMapper;
 import com.unis.module.coding.dal.mysql.users.UsersMapper;
 import com.unis.module.core.enums.ErrorCodeConstants;
+import com.unis.module.core.enums.project.DeliveryBxzt;
 import com.unis.module.core.enums.project.DeliveryHyState;
 import com.unis.module.system.api.permission.PermissionApi;
 import com.unis.module.system.enums.permission.RoleCodeEnum;
@@ -39,6 +42,7 @@ import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import static com.unis.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -72,7 +76,8 @@ public class TaskServiceImpl implements TaskService {
     private BankMapper bankMapper;
     @Resource
     private UsersMapper usersMapper;
-
+    @Resource
+    private CaxxMapper caxxMapper;
     @Override
     public IPage<TaskRespVO> getTaskList(TaskPageReqVO pageReqVO) {
         // 根据角色不同，查询不同数据
@@ -85,7 +90,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public IPage<TaskRespVO> getAllStoreroomList(TaskPageReqVO pageReqVO) {
         // 根据角色不同，查询不同数据
-        addParamDeptIds(pageReqVO);
+                addParamDeptIds(pageReqVO);
 
         IPage<TaskRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
         return dkMapper.getAllStoreroomList(page, pageReqVO);
@@ -126,8 +131,17 @@ public class TaskServiceImpl implements TaskService {
                         .setHyState(reqVO.getHyState())
                         .setHyryId(SecurityFrameworkUtils.getLoginUserId())
                         .setHyryName(SecurityFrameworkUtils.getLoginUserNickname());
-                provinceMapper.updateByKqId(provinceDO, kqId);
+                provinceMapper.updateByKqId(provinceDO, kqId, reqVO.getCaIds());
             });
+
+            //修改仓房信息:备选状态:
+            if(Objects.equals(DeliveryHyState.YES_HY.getCode(), reqVO.getHyState()) && reqVO.getCaIds() != null ){
+                extractedBxzt(reqVO,DeliveryBxzt.CHOICE.getCode());
+            }
+
+            if(Objects.equals(DeliveryHyState.NO_HY.getCode(), reqVO.getHyState()) && reqVO.getCaIds() != null ){
+                extractedBxzt(reqVO,DeliveryBxzt.UNVERIFIED_FAIL.getCode());
+            }
         }
         // 银行核验人员
         if(roleCodes.contains(RoleCodeEnum.BANK_VERIFICATION_PERSONNEL.getCode())) {
@@ -136,12 +150,31 @@ public class TaskServiceImpl implements TaskService {
                         .setHyState(reqVO.getHyState())
                         .setHyryId(SecurityFrameworkUtils.getLoginUserId())
                         .setHyryName(SecurityFrameworkUtils.getLoginUserNickname());
-                bankMapper.updateByKqId(bankDO, kqId);
+                bankMapper.updateByKqId(bankDO, kqId, reqVO.getCaIds());
             });
+
+            //修改仓房信息:备选状态:
+            if(Objects.equals(DeliveryHyState.YES_HY.getCode(), reqVO.getHyState()) && reqVO.getCaIds() != null ){
+                extractedBxzt(reqVO,DeliveryBxzt.RECOGNIZED.getCode());
+            }
+            if(Objects.equals(DeliveryHyState.NO_HY.getCode(), reqVO.getHyState()) && reqVO.getCaIds() != null ){
+                extractedBxzt(reqVO,DeliveryBxzt.BANK_UNVERIFIED_FAIL.getCode());
+            }
         }
+
+
         return true;
     }
 
+    private void extractedBxzt(TaskPageReqVO reqVO,Integer bxzt) {
+        reqVO.getCaIds().forEach(caId -> {
+            CaxxDO caxxDO = new CaxxDO();
+            caxxDO.setId(caId);
+            caxxDO.setBxzt(bxzt);
+            caxxMapper.updateById(caxxDO);
+        });
+    }
+
     @Override
     public Boolean getStoreroom(TaskPageReqVO reqVO) {
         if(reqVO.getCaIds() == null || reqVO.getCaIds().isEmpty()){
@@ -156,6 +189,10 @@ public class TaskServiceImpl implements TaskService {
                             .eq(UsersDO::getCreator, SecurityFrameworkUtils.getLoginUserId())
                             .eq(UsersDO::getCaId, caId)));
 
+            //修改仓房信息:备选状态:
+            if(reqVO.getCaIds() != null ){
+                extractedBxzt(reqVO,DeliveryBxzt.RECOGNIZED.getCode());
+            }
         } else {
             // 校验 是登录人可选的任务
             List<TaskCaxxRespVO> taskCaxxRespVOS = verifyStoreroom(reqVO);
@@ -165,6 +202,11 @@ public class TaskServiceImpl implements TaskService {
                             .setId(YitIdHelper.nextId())
                             .setKqId(taskCaxxRespVO.getKqId())
                             .setCaId(taskCaxxRespVO.getCaId())));
+
+            //修改仓房信息:备选状态:
+            if( reqVO.getCaIds() != null ){
+                extractedBxzt(reqVO,DeliveryBxzt.SELECTED.getCode());
+            }
         }
 
         return true;

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dk/DkMapper.xml

@@ -15,7 +15,9 @@
             dp.HY_STATE ,
             dk.SHXYDM ,
             dk.KQBM ,
-            COUNT(distinct dc.ID) AS HY_NUM
+            COUNT(distinct dc.ID) AS HY_NUM,
+            SUM(CASE WHEN dp.HY_STATE = 1 THEN 1 ELSE 0 END) AS HYTG_NUM,
+            SUM(CASE WHEN dp.HY_STATE = 2 THEN 1 ELSE 0 END) AS HYBTG_NUM
         FROM
             ${pageReqVO.tableName} dp
         LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
@@ -263,7 +265,8 @@
             dc.SJSYNX,
             dc.SFKC,
             dk."zcckj",
-            dk."wtbgckj"
+            dk."wtbgckj",
+            dp.HY_STATE
         FROM
             ${pageReqVO.tableName} dp
             LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
@@ -280,6 +283,9 @@
         <if test="pageReqVO.bankType != null and pageReqVO.bankType != ''">
             AND FIND_IN_SET(#{pageReqVO.bankType},dp.RDYH_ID)
         </if>
+        <if test="pageReqVO.cfmc != null and pageReqVO.cfmc != ''">
+            AND dc.CFMC LIKE CONCAT('%', #{pageReqVO.cfmc}, '%')
+        </if>
         <if test="pageReqVO.kqIds != null and pageReqVO.kqIds.size() > 0">
             AND dp.KQ_ID IN
             <foreach collection="pageReqVO.kqIds" item="kqId" open="(" separator="," close=")">