【功能开发】app 端:存粮人相关接口

delivery-module-core/delivery-module-core-api/src/main/java/com/unis/module/core/enums/project/DeliveryHyState.java

@@ -12,13 +12,9 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum DeliveryHyState {
-    //    核验中	3
     WAIT_HY(3, "核验中"),
-    //    核验不通过	2
     NO_HY(2, "核验不通过"),
-    //    核验通过	1
     YES_HY(1, "核验通过"),
-    //    待核验	0
     WAIT(0, "待核验"),
 
     ;

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

@@ -32,22 +32,42 @@ public class TaskController {
     public CommonResult<IPage<TaskRespVO>> getTaskList(@Valid @RequestBody TaskPageReqVO pageReqVO) {
         return success(taskService.getTaskList(pageReqVO));
     }
+    @PostMapping("/getAllStoreroomList")
+    @Operation(summary = "获取存粮人可以 选择的交收库列表(存粮人)")
+    public CommonResult<IPage<TaskRespVO>> getAllStoreroomList(@Valid @RequestBody TaskPageReqVO pageReqVO) {
+        return success(taskService.getAllStoreroomList(pageReqVO));
+    }
+    @PostMapping("/getMyStoreroomList")
+    @Operation(summary = "获取存粮人选择的交收库列表(存粮人)")
+    public CommonResult<IPage<TaskRespVO>> getMyStoreroomList(@Valid @RequestBody TaskPageReqVO pageReqVO) {
+        return success(taskService.getMyStoreroomList(pageReqVO));
+    }
     @PostMapping("/getTasks")
-    @Operation(summary = "领取任务(多个):参数:kqIds列表,hyState:核验状态(0:待查验,1:查验通过,2:查验不通过3:核验中)")
+    @Operation(summary = "领取/核验任务(多个):参数:kqIds列表,hyState:核验状态(0:待查验,1:查验通过,2:查验不通过3:核验中)")
     public CommonResult<Boolean> getTasks(@RequestBody TaskPageReqVO reqVO) {
         return success(taskService.getTasks(reqVO));
     }
-    @PostMapping("/hyKqxx")
-    @Operation(summary = "核验通过/不通过:参数:kqIds列表,hyState:核验状态(0:待查验,1:查验通过,2:查验不通过3:核验中)")
-    public CommonResult<Boolean> hyKqxx(@RequestBody TaskPageReqVO reqVO) {
-        return success(taskService.hyKqxx(reqVO));
+    @PostMapping("/getStoreroom")
+    @Operation(summary = "选择交收库(存粮人)")
+    public CommonResult<Boolean> getStoreroom(@RequestBody TaskPageReqVO reqVO) {
+        return success(taskService.getStoreroom(reqVO));
     }
+//    @PostMapping("/hyKqxx")
+//    @Operation(summary = "核验通过/不通过:参数:kqIds列表,hyState:核验状态(0:待查验,1:查验通过,2:查验不通过3:核验中)")
+//    public CommonResult<Boolean> hyKqxx(@RequestBody TaskPageReqVO reqVO) {
+//        return success(taskService.hyKqxx(reqVO));
+//    }
 
     @PostMapping("/getCaxxByKqId")
-    @Operation(summary = "获取仓房信息(根据库区id 查询仓房列表)")
+    @Operation(summary = "获取仓房列表信息(根据库区id 查询仓房列表-不分页)")
     public CommonResult<List<TaskCaxxRespVO>> getCaxxByKqId(@RequestBody TaskPageReqVO reqVO) {
         return success(taskService.getCaxxByKqId(reqVO));
     }
+    @PostMapping("/getCaxxByKqIdForClr")
+    @Operation(summary = "存粮人获取仓房列表信息(根据库区id 查询仓房列表-不分页)(存粮人)")
+    public CommonResult<List<TaskCaxxRespVO>> getCaxxByKqIdForClr(@RequestBody TaskPageReqVO reqVO) {
+        return success(taskService.getCaxxByKqIdForClr(reqVO));
+    }
 
     @PostMapping("/getKqxxByKqId")
     @Operation(summary = "获取库区信息(根据库区id)")

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

@@ -11,6 +11,12 @@ import java.math.BigDecimal;
 @ExcelIgnoreUnannotated
 public class TaskCaxxRespVO {
 
+    @Schema(description = "库区id(DELIVERY_KQXX.ID)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1709")
+    private Long kqId;
+
+    @Schema(description = "仓房id(DELIVERY_CAXX.ID)", requiredMode = Schema.RequiredMode.REQUIRED, example = "14592")
+    private Long caId;
+
     @Schema(description = "仓房名称")
     private String cfmc;
 

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

@@ -14,10 +14,15 @@ import java.util.List;
 @ToString(callSuper = true)
 public class TaskPageReqVO extends PageParam {
 
-    /** 待领取任务列表 */
+    @Schema(description = "待领取任务列表")
     public static final Integer LIST_TYPE_TASK1 = 1;
-    /** 我的任务列表 */
+    @Schema(description = "已领取任务列表")
     public static final Integer LIST_TYPE_TASK2 = 2;
+    @Schema(description = "存粮人可选列表")
+    public static final Integer LIST_TYPE_TASK3 = 3;
+    @Schema(description = "存粮人已选列表")
+    public static final Integer LIST_TYPE_TASK4 = 4;
+
     /** 省已选择-表名 */
     public static final String TABLE_NAME_DELIVERY_PROVINCE = "DELIVERY_PROVINCE";
     /** 银行已选择-表名 */
@@ -56,8 +61,16 @@ public class TaskPageReqVO extends PageParam {
     @Schema(description = "库区 ids 领取任务/核验通过 使用")
     List<Long> kqIds;
 
+    @Schema(description = "仓房 ids 存粮人选择仓房 使用")
+    List<Long> caIds;
+
     private String tableName;
 
     private String deptId;
 
+    @Schema(description = "存粮人是否选定(0:未选定,1:已选定)")
+    private Integer clrsfxd;
+
+    private String creator;
+
 }

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

@@ -14,6 +14,7 @@ public class TaskRespVO {
 
     @Schema(description = "仓房id(DELIVERY_CAXX.ID)", requiredMode = Schema.RequiredMode.REQUIRED, example = "14592")
     private Long caId;
+
     @Schema(description = "库区代码")
     private String kqdm;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/users/UsersDO.java

@@ -0,0 +1,38 @@
+package com.unis.module.coding.dal.dataobject.users;
+
+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 lombok.*;
+
+/**
+ * 存粮人选定仓 DO
+ *
+ * @author 超级管理员
+ */
+@TableName("delivery_users")
+@KeySequence("delivery_users_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UsersDO extends BaseDO {
+
+    /**
+     * 雪花id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 库区id(DELIVERY_KQXX.ID)
+     */
+    private Long kqId;
+    /**
+     * 仓房id(DELIVERY_CAXX.ID)
+     */
+    private Long caId;
+
+}

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/caxx/CaxxMapper.java

@@ -1,23 +1,19 @@
 package com.unis.module.coding.dal.mysql.caxx;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.framework.common.pojo.PageResult;
-import com.unis.framework.common.util.object.ObjectUtils;
-import com.unis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.unis.framework.mybatis.core.mapper.BaseMapperX;
+import com.unis.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.unis.module.coding.controller.admin.caxx.vo.CaxxPageReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.SparePageReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO;
-import com.unis.module.coding.dal.dataobject.bank.BankDO;
 import com.unis.module.coding.dal.dataobject.caxx.CaxxDO;
 import org.apache.ibatis.annotations.Mapper;
-import com.unis.module.coding.controller.admin.caxx.vo.*;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 仓廒信息; Mapper
  *

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/dk/DkMapper.java

@@ -2,12 +2,15 @@ package com.unis.module.coding.dal.mysql.dk;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.unis.framework.mybatis.core.mapper.BaseMapperX;
+import com.unis.module.coding.controller.admin.task.vo.TaskCaxxRespVO;
 import com.unis.module.coding.controller.admin.task.vo.TaskPageReqVO;
 import com.unis.module.coding.controller.admin.task.vo.TaskRespVO;
 import com.unis.module.coding.dal.dataobject.dk.DkDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 打卡信息 Mapper
  *
@@ -21,4 +24,10 @@ public interface DkMapper extends BaseMapperX<DkDO> {
     default DkDO selectByKqIdAndUserId(Long kqId, Long loginUserId){
         return selectOne("kqId", kqId, "userId", loginUserId);
     }
+
+    IPage<TaskRespVO> getMyStoreroomList(IPage<TaskRespVO> page,@Param("pageReqVO") TaskPageReqVO pageReqVO);
+
+    IPage<TaskRespVO> getAllStoreroomList(IPage<TaskRespVO> page,@Param("pageReqVO")  TaskPageReqVO pageReqVO);
+
+    List<TaskCaxxRespVO> getCaxxByKqIdForClr(@Param("pageReqVO") TaskPageReqVO reqVO);
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/users/UsersMapper.java

@@ -0,0 +1,15 @@
+package com.unis.module.coding.dal.mysql.users;
+
+import com.unis.framework.mybatis.core.mapper.BaseMapperX;
+import com.unis.module.coding.dal.dataobject.users.UsersDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 存粮人选定仓 Mapper
+ *
+ * @author 超级管理员
+ */
+@Mapper
+public interface UsersMapper extends BaseMapperX<UsersDO> {
+
+}

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

@@ -15,6 +15,10 @@ public interface TaskService {
 
     IPage<TaskRespVO> getTaskList(TaskPageReqVO pageReqVO);
 
+    IPage<TaskRespVO> getAllStoreroomList(TaskPageReqVO pageReqVO);
+
+    IPage<TaskRespVO> getMyStoreroomList(TaskPageReqVO pageReqVO);
+
     Boolean getTasks(TaskPageReqVO reqVO);
 
     Boolean hyKqxx(TaskPageReqVO reqVO);
@@ -28,4 +32,8 @@ public interface TaskService {
     TaskDkxxRespVO getDkxxByKqId(TaskPageReqVO reqVO);
 
     Boolean setDkxxByKqId(TaskDkxxSaveVO saveVO);
+
+    Boolean getStoreroom(TaskPageReqVO reqVO);
+
+    List<TaskCaxxRespVO> getCaxxByKqIdForClr(TaskPageReqVO reqVO);
 }

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

@@ -1,5 +1,6 @@
 package com.unis.module.coding.service.task;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +18,7 @@ import com.unis.module.coding.dal.dataobject.dk.DkDO;
 import com.unis.module.coding.dal.dataobject.dwxx.DwxxDO;
 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;
@@ -25,6 +27,7 @@ import com.unis.module.coding.dal.mysql.dk.DkMapper;
 import com.unis.module.coding.dal.mysql.dwxx.DwxxMapper;
 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.DeliveryHyState;
 import com.unis.module.system.api.permission.PermissionApi;
@@ -71,6 +74,8 @@ public class TaskServiceImpl implements TaskService {
     private CwxxYearMapper cwxxYearMapper;
     @Resource
     private BankMapper bankMapper;
+    @Resource
+    private UsersMapper usersMapper;
 
     @Override
     public IPage<TaskRespVO> getTaskList(TaskPageReqVO pageReqVO) {
@@ -84,6 +89,31 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
+    public IPage<TaskRespVO> getAllStoreroomList(TaskPageReqVO pageReqVO) {
+        // 根据角色不同，查询不同数据
+        addParamDeptIds(pageReqVO);
+
+        IPage<TaskRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        return dkMapper.getAllStoreroomList(page, pageReqVO);
+    }
+
+    @Override
+    public IPage<TaskRespVO> getMyStoreroomList(TaskPageReqVO pageReqVO) {
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserIdNotNull();
+        // 查询登录人角色标识
+        Set<String> roleCodes = permissionApi.getUserRoleCodeListByUserIdFromCache(loginUserId);
+
+        // 存粮人
+        if(!roleCodes.contains(RoleCodeEnum.GRAIN_DEPOSITOR.getCode())) {
+            throw exception(ErrorCodeConstants.APP_ACCOUNT_PERMISSION_DENIED);
+        }
+
+        pageReqVO.setCreator(String.valueOf(loginUserId));
+        IPage<TaskRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        return dkMapper.getMyStoreroomList(page, pageReqVO);
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean getTasks(TaskPageReqVO reqVO) {
 
@@ -120,6 +150,30 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
+    public Boolean getStoreroom(TaskPageReqVO reqVO) {
+
+        // 存粮人选定仓 新增数据 以仓房为单位
+        if(0 == reqVO.getClrsfxd()) {
+            //存粮人删除选定
+            reqVO.getCaIds().forEach(caId ->
+                    usersMapper.delete(new QueryWrapper<UsersDO>().lambda()
+                    .eq(UsersDO::getCreator, SecurityFrameworkUtils.getLoginUserId())
+                    .eq(UsersDO::getCaId, caId)));
+        }else{
+            // 校验 是登录人可选的任务
+            List<TaskCaxxRespVO> taskCaxxRespVOS = verifyStoreroom(reqVO);
+
+            taskCaxxRespVOS.forEach(taskCaxxRespVO ->
+                    usersMapper.insert(new UsersDO()
+                            .setId(YitIdHelper.nextId())
+                            .setKqId(taskCaxxRespVO.getKqId())
+                            .setCaId(taskCaxxRespVO.getCaId())));
+        }
+
+        return true;
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean hyKqxx(TaskPageReqVO reqVO) {
         //校验是登录人可选的任务
@@ -165,6 +219,13 @@ public class TaskServiceImpl implements TaskService {
 
         return new ArrayList<>();
     }
+    @Override
+    public List<TaskCaxxRespVO> getCaxxByKqIdForClr(TaskPageReqVO reqVO) {
+        // 根据角色不同，查询不同数据
+        addParamDeptIds(reqVO);
+
+        return dkMapper.getCaxxByKqIdForClr(reqVO);
+    }
 
     @Override
     public TaskKqxxRespVO getKqxxByKqId(TaskPageReqVO reqVO) {
@@ -280,6 +341,20 @@ public class TaskServiceImpl implements TaskService {
             throw exception(ErrorCodeConstants.APP_TASK_RECEIVE_ERROR);
         }
     }
+    private  List<TaskCaxxRespVO> verifyStoreroom(TaskPageReqVO reqVO) {
+
+        TaskPageReqVO pageReqVO = new TaskPageReqVO();
+        pageReqVO.setCaIds(reqVO.getCaIds());
+        pageReqVO.setListType(TaskPageReqVO.LIST_TYPE_TASK3);
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+
+        List<TaskCaxxRespVO> taskList = getCaxxByKqIdForClr(pageReqVO);
+
+        if(taskList.size() != reqVO.getKqIds().size()) {
+            throw exception(ErrorCodeConstants.APP_TASK_RECEIVE_ERROR);
+        }
+        return taskList;
+    }
 
     private void addParamDeptIds(@NotNull TaskPageReqVO pageReqVO) {
 
@@ -291,10 +366,21 @@ public class TaskServiceImpl implements TaskService {
         // 查询待核验列表
         if(pageReqVO.getListType() == null){
             throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
-        }else if(1 == pageReqVO.getListType()) {
+        }else if(TaskPageReqVO.LIST_TYPE_TASK1.equals(pageReqVO.getListType())) {
+            // 可选任务
             pageReqVO.setHyState(DeliveryHyState.WAIT.getCode());
-        } else if(2 == pageReqVO.getListType()) {
+        } else if(TaskPageReqVO.LIST_TYPE_TASK2.equals(pageReqVO.getListType())) {
+            // 已选任务
             pageReqVO.setHyryId(loginUserId);
+        } else if(TaskPageReqVO.LIST_TYPE_TASK3.equals(pageReqVO.getListType())) {
+            // 存粮人可选列表
+            pageReqVO.setHyState(DeliveryHyState.YES_HY.getCode());
+            pageReqVO.setClrsfxd(0);
+        } else if(TaskPageReqVO.LIST_TYPE_TASK4.equals(pageReqVO.getListType())) {
+            // 存粮人已选列表
+            pageReqVO.setHyState(DeliveryHyState.YES_HY.getCode());
+            pageReqVO.setClrsfxd(1);
+            pageReqVO.setCreator(String.valueOf(loginUserId));
         } else {
             throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
         }
@@ -312,18 +398,12 @@ public class TaskServiceImpl implements TaskService {
             }
             return;
         }
-        // 银行核验人员
-        if(roleCodes.contains(RoleCodeEnum.VERIFICATION_PERSONNEL.getCode())) {
+        // 银行核验人员 | 存粮人
+        if(roleCodes.contains(RoleCodeEnum.VERIFICATION_PERSONNEL.getCode()) ||
+                roleCodes.contains(RoleCodeEnum.GRAIN_DEPOSITOR.getCode())) {
             if(loginUser != null) {
-                String areaLevel = loginUser.getInfo().get("areaLevel");
-                if("1".equals(areaLevel)) {
-                    pageReqVO.setSheng(loginUser.getInfo().get("sheng_code"));
-                    //银行需要查询自己银行选定的
-                    pageReqVO.setDeptId(loginUser.getInfo().get("deptId"));
-                    pageReqVO.setTableName(TaskPageReqVO.TABLE_NAME_DELIVERY_BANK);
-                } else {
-                    throw exception(ErrorCodeConstants.APP_ACCOUNT_PERMISSION_DENIED);
-                }
+                pageReqVO.setDeptId(loginUser.getInfo().get("deptId"));
+                pageReqVO.setTableName(TaskPageReqVO.TABLE_NAME_DELIVERY_BANK);
             }
             return;
         }

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

@@ -20,11 +20,11 @@
             dp.HYRY_ID ,
             dp.HYRY_NAME ,
             dp.HY_STATE ,
-            COUNT(dc.ID) AS HY_NUM
+            COUNT(distinct dc.ID) AS HY_NUM
         FROM
             ${pageReqVO.tableName} dp
         LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.KQID AND dc.DELETED = 0
+        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID AND dc.DELETED = 0
         WHERE
             dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0
         <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
@@ -45,9 +45,140 @@
         <if test="pageReqVO.deptId != null and pageReqVO.deptId != ''">
             AND FIND_IN_SET(pageReqVO.deptId,dp.RDYH_ID)
         </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=")">
+                #{kqId}
+            </foreach>
+        </if>
         GROUP BY
             dk.ID
         ORDER BY
             dp.ID desc
     </select>
+    <select id="getMyStoreroomList" resultType="com.unis.module.coding.controller.admin.task.vo.TaskRespVO">
+        SELECT
+        dk.ID AS kqId,
+        dk.KQDM ,
+        dk.KQMC ,
+        dk.JTDZ ,
+        dk.SHENG ,dk.SHI ,dk.XIAN ,
+        COUNT(distinct dc.ID) AS HY_NUM
+        FROM
+        DELIVERY_USERS du
+        LEFT JOIN DELIVERY_KQXX dk ON du.KQ_ID = dk.ID
+        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID AND dc.DELETED = 0
+        WHERE dk.DELETED = 0 AND dk.SFZX = 0 and du.DELETED = 0
+            <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
+                AND dk.SHENG = #{pageReqVO.sheng}
+            </if>
+            <if test="pageReqVO.shi != null and pageReqVO.shi != ''">
+                AND dk.SHI = #{pageReqVO.shi}
+            </if>
+            <if test="pageReqVO.xian != null and pageReqVO.xian != ''">
+                AND dk.XIAN = #{pageReqVO.xian}
+            </if>
+            <if test="pageReqVO.creator != null">
+                AND du.CREATOR = #{pageReqVO.creator}
+            </if>
+        GROUP BY
+            dk.ID
+        ORDER BY
+            du.ID desc
+    </select>
+    <select id="getAllStoreroomList" resultType="com.unis.module.coding.controller.admin.task.vo.TaskRespVO">
+        SELECT
+        dk.ID AS kqId,
+        dk.KQDM ,
+        dk.KQMC ,
+        dk.JTDZ ,
+        dk.SHENG ,dk.SHI ,dk.XIAN ,
+        dp.HYRY_ID ,
+        dp.HYRY_NAME ,
+        dp.HY_STATE ,
+        COUNT(distinct dc.ID) AS HY_NUM
+        FROM
+        DELIVERY_BANK dp
+        LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
+        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID
+        LEFT JOIN DELIVERY_USERS du ON dc.ID = du.CA_ID AND du.DELETED = 0
+        WHERE
+        dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0 AND dc.DELETED = 0
+        AND du.ID IS NULL
+        <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
+            AND dk.SHENG = #{pageReqVO.sheng}
+        </if>
+        <if test="pageReqVO.shi != null and pageReqVO.shi != ''">
+            AND dk.SHI = #{pageReqVO.shi}
+        </if>
+        <if test="pageReqVO.xian != null and pageReqVO.xian != ''">
+            AND dk.XIAN = #{pageReqVO.xian}
+        </if>
+        <if test="pageReqVO.hyState != null">
+            AND dp.HY_STATE = #{pageReqVO.hyState}
+        </if>
+        <if test="pageReqVO.hyryId != null">
+            AND dp.HYRY_ID = #{pageReqVO.hyryId}
+        </if>
+        <if test="pageReqVO.deptId != null and pageReqVO.deptId != ''">
+            AND FIND_IN_SET(pageReqVO.deptId,dp.RDYH_ID)
+        </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=")">
+                #{kqId}
+            </foreach>
+        </if>
+        GROUP BY
+        dk.ID
+        ORDER BY
+        dp.ID desc
+    </select>
+    <select id="getCaxxByKqIdForClr" resultType="com.unis.module.coding.controller.admin.task.vo.TaskCaxxRespVO">
+        SELECT
+            dk.ID AS kqId,
+            dc.ID AS caId,
+            dc.CFMC ,
+            dc.CFLX ,
+            dc.CAZT ,
+            dc.SJCR ,
+            dc.SFKC ,
+            dk."zcckj" ,
+            dk."wtbgckj"
+        FROM
+            DELIVERY_KQXX dk
+        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID
+        left join DELIVERY_BANK db on dk.ID = db.KQ_ID and db.deleted = 0
+        LEFT JOIN DELIVERY_USERS du ON dc.ID = du.CA_ID and du.deleted = 0
+        WHERE
+            dk.DELETED =0 AND dc.DELETED = 0 AND dk.SFZX = 0
+        <if test="pageReqVO.kqId != null">
+            AND dk.ID = #{pageReqVO.kqId}
+        </if>
+        <if test="pageReqVO.deptId != null and pageReqVO.deptId != ''">
+            AND FIND_IN_SET(pageReqVO.deptId,dp.RDYH_ID)
+        </if>
+        <if test="pageReqVO.clrsfxd != null and pageReqVO.clrsfxd == 0 ">
+            AND du.ID IS NULL
+        </if>
+        <if test="pageReqVO.clrsfxd != null and pageReqVO.clrsfxd == 1 ">
+            AND du.ID IS NOT NULL
+        </if>
+        <if test="pageReqVO.creator != null">
+            AND du.CREATOR = #{pageReqVO.creator}
+        </if>
+        <if test="pageReqVO.hyState != null">
+            AND db.HY_STATE = #{pageReqVO.hyState}
+        </if>
+        <if test="pageReqVO.caIds != null and pageReqVO.caIds.size() > 0">
+            AND dc.ID IN
+            <foreach collection="pageReqVO.caIds" item="caId" open="(" separator="," close=")">
+                #{caId}
+            </foreach>
+        </if>
+        GROUP BY
+        dc.ID
+        ORDER BY
+        dc.ID desc
+    </select>
 </mapper>

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/users/UsersMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.unis.module.coding.dal.mysql.users.UsersMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

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

@@ -25,6 +25,8 @@ public enum RoleCodeEnum {
     INSURANCE_COMPANY("insurance_company", "保险公司"),
     //    银行核验人员	verification_personnel
     VERIFICATION_PERSONNEL("verification_personnel", "银行核验人员"),
+    //    存粮人(贷款人) grain_depositor
+    GRAIN_DEPOSITOR("grain_depositor", "存粮人(贷款人)"),
     //    省局	sheng_admin
     SHENG_ADMIN("sheng_admin", "省局"),
     //    市局	shi_admin