【功能修改】app 端:银行 部门改成字典中银行类型,银行角色标识变更

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

@@ -32,38 +32,38 @@ 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) {
         pageReqVO.setListType(TaskPageReqVO.LIST_TYPE_TASK3);
         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:核验中)")
     public CommonResult<Boolean> getTasks(@RequestBody TaskPageReqVO reqVO) {
         return success(taskService.getTasks(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 查询仓房列表-不分页)")
     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) {
@@ -75,16 +75,19 @@ public class TaskController {
     public CommonResult<TaskKqxxRespVO> getKqxxByKqId(@RequestBody TaskPageReqVO reqVO) {
         return success(taskService.getKqxxByKqId(reqVO));
     }
+
     @PostMapping("/getCwxxByKqId")
     @Operation(summary = "获取财务信息(根据库区id)")
     public CommonResult<TaskCwxxRespVO> getCwxxByKqId(@RequestBody TaskPageReqVO reqVO) {
         return success(taskService.getCwxxByKqId(reqVO));
     }
+
     @PostMapping("/getDkxxByKqId")
     @Operation(summary = "获取打卡信息(根据库区id&userId)")
     public CommonResult<TaskDkxxRespVO> getDkxxByKqId(@RequestBody TaskPageReqVO reqVO) {
         return success(taskService.getDkxxByKqId(reqVO));
     }
+
     @PostMapping("/setDkxxByKqId")
     @Operation(summary = "打卡(传 id 是变更(传图片),不传 id 是新增")
     public CommonResult<Boolean> setDkxxByKqId(@RequestBody TaskDkxxSaveVO saveVO) {

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

@@ -31,4 +31,14 @@ public class TaskCaxxRespVO {
 
     @Schema(description = "设计使用年限")
     private String sjsynx;
+
+    @Schema(description = "是否空仓(0:否,1:是)")
+    private Integer sfkc;
+
+    @Schema(description = "租仓参考价(元/月)")
+    private Integer zcckj;
+
+    @Schema(description = "委托保管参考价(元/吨/月)")
+    private Integer wtbgckj;
+
 }

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

@@ -33,7 +33,4 @@ public class TaskDkxxSaveVO {
     @Schema(description = "打卡类型:1:省核验人,2:银行核验人")
     private Integer dkType;
 
-    @Schema(description = "部门id")
-    private Long deptId;
-
 }

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

@@ -66,7 +66,7 @@ public class TaskPageReqVO extends PageParam {
 
     private String tableName;
 
-    private String deptId;
+    private String bankType;
 
     @Schema(description = "存粮人是否选定(0:未选定,1:已选定)")
     private Integer clrsfxd;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/dk/DkDO.java

@@ -50,8 +50,5 @@ public class DkDO extends BaseDO {
     private String pzxx;
     /** 打卡类型:1:省核验人,2:银行核验人 */
     private Integer dkType;
-    /**
-     * 部门id
-     */
-    private Long deptId;
+
 }

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

@@ -22,7 +22,7 @@ public interface DkMapper extends BaseMapperX<DkDO> {
     IPage<TaskRespVO> getTaskList(IPage<TaskRespVO> page, @Param("pageReqVO") TaskPageReqVO pageReqVO);
 
     default DkDO selectByKqIdAndUserId(Long kqId, Long loginUserId){
-        return selectOne("kqId", kqId, "userId", loginUserId);
+        return selectOne(DkDO::getKqId, kqId,DkDO::getUserId, loginUserId);
     }
 
     IPage<TaskRespVO> getMyStoreroomList(IPage<TaskRespVO> page,@Param("pageReqVO") TaskPageReqVO pageReqVO);

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

@@ -21,8 +21,6 @@ public interface TaskService {
 
     Boolean getTasks(TaskPageReqVO reqVO);
 
-    Boolean hyKqxx(TaskPageReqVO reqVO);
-
     List<TaskCaxxRespVO> getCaxxByKqId(TaskPageReqVO reqVO);
 
     TaskKqxxRespVO getKqxxByKqId(TaskPageReqVO reqVO);

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

@@ -137,7 +137,7 @@ public class TaskServiceImpl implements TaskService {
             });
         }
         // 银行核验人员
-        if(roleCodes.contains(RoleCodeEnum.VERIFICATION_PERSONNEL.getCode())) {
+        if(roleCodes.contains(RoleCodeEnum.BANK_VERIFICATION_PERSONNEL.getCode())) {
             reqVO.getKqIds().forEach(kqId -> {
                 BankDO bankDO = new BankDO()
                         .setHyState(reqVO.getHyState() == null ? DeliveryHyState.WAIT_HY.getCode() : reqVO.getHyState())
@@ -157,9 +157,9 @@ public class TaskServiceImpl implements TaskService {
             //存粮人删除选定
             reqVO.getCaIds().forEach(caId ->
                     usersMapper.delete(new QueryWrapper<UsersDO>().lambda()
-                    .eq(UsersDO::getCreator, SecurityFrameworkUtils.getLoginUserId())
-                    .eq(UsersDO::getCaId, caId)));
-        }else{
+                            .eq(UsersDO::getCreator, SecurityFrameworkUtils.getLoginUserId())
+                            .eq(UsersDO::getCaId, caId)));
+        } else {
             // 校验 是登录人可选的任务
             List<TaskCaxxRespVO> taskCaxxRespVOS = verifyStoreroom(reqVO);
 
@@ -174,51 +174,25 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean hyKqxx(TaskPageReqVO reqVO) {
-        //校验是登录人可选的任务
-        reqVO.setListType(TaskPageReqVO.LIST_TYPE_TASK2);
-        verifyTask(reqVO);
-
-        Long loginUserId = SecurityFrameworkUtils.getLoginUserIdNotNull();
-        // 查询登录人角色标识
-        Set<String> roleCodes = permissionApi.getUserRoleCodeListByUserIdFromCache(loginUserId);
-
-        // 更新核验状态为核验中,核验人员 id,核验人员名
-        // 省级核验人员
-        if(roleCodes.contains(RoleCodeEnum.PROVINCIAL_VERIFICATION_PERSONNEL.getCode())) {
-            reqVO.getKqIds().forEach(kqId -> {
-                ProvinceDO provinceDO = new ProvinceDO()
-                        .setHyState(reqVO.getHyState())
-                        .setHyryId(SecurityFrameworkUtils.getLoginUserId())
-                        .setHyryName(SecurityFrameworkUtils.getLoginUserNickname());
-                provinceMapper.updateByKqId(provinceDO,kqId);
-            });
-        }
-        // 银行核验人员
-        if(roleCodes.contains(RoleCodeEnum.VERIFICATION_PERSONNEL.getCode())) {
-            reqVO.getKqIds().forEach(kqId -> {
-                BankDO bankDO = new BankDO()
-                        .setHyState(reqVO.getHyState())
-                        .setHyryId(SecurityFrameworkUtils.getLoginUserId())
-                        .setHyryName(SecurityFrameworkUtils.getLoginUserNickname());
-                bankMapper.updateByKqId(bankDO, kqId);
-            });
-        }
-        return true;
-    }
-
-    @Override
     public List<TaskCaxxRespVO> getCaxxByKqId(TaskPageReqVO reqVO) {
 
         List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(reqVO.getKqId());
 
-        if(ObjectUtils.isEmpty(caxxDOS)){
-           return BeanUtils.toBean(caxxDOS, TaskCaxxRespVO.class);
+        if(ObjectUtils.isEmpty(caxxDOS)) {
+            List<TaskCaxxRespVO> list = BeanUtils.toBean(caxxDOS, TaskCaxxRespVO.class);
+
+            KqxxDO kqxxDO = kqxxMapper.selectById(list.get(0).getKqId());
+            list.forEach(taskCaxxRespVO -> {
+                taskCaxxRespVO.setZcckj(kqxxDO.getZcckj());
+                taskCaxxRespVO.setWtbgckj(kqxxDO.getWtbgckj());
+            });
+
+            return list;
         }
 
         return new ArrayList<>();
     }
+
     @Override
     public List<TaskCaxxRespVO> getCaxxByKqIdForClr(TaskPageReqVO reqVO) {
         // 根据角色不同，查询不同数据
@@ -253,7 +227,7 @@ public class TaskServiceImpl implements TaskService {
 
         CwxxDO cwxxDO = cwxxMapper.selectByKqId(reqVO.getKqId());
 
-        if(ObjectUtils.isEmpty(cwxxDO)){
+        if(ObjectUtils.isEmpty(cwxxDO)) {
             return null;
         }
 
@@ -270,7 +244,7 @@ public class TaskServiceImpl implements TaskService {
     public TaskDkxxRespVO getDkxxByKqId(TaskPageReqVO reqVO) {
         DkDO dkDO = dkMapper.selectByKqIdAndUserId(reqVO.getKqId(), SecurityFrameworkUtils.getLoginUserId());
 
-        if(ObjectUtils.isEmpty(dkDO)){
+        if(ObjectUtils.isEmpty(dkDO)) {
             return null;
         }
         return BeanUtils.toBean(dkDO, TaskDkxxRespVO.class);
@@ -280,14 +254,14 @@ public class TaskServiceImpl implements TaskService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean setDkxxByKqId(TaskDkxxSaveVO saveVO) {
 
-        if(ObjectUtils.isEmpty(saveVO) || ObjectUtils.isEmpty(saveVO.getKqId())){
+        if(ObjectUtils.isEmpty(saveVO) || ObjectUtils.isEmpty(saveVO.getKqId())) {
             throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
         }
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
-        DkDO dkDO = dkMapper.selectByKqIdAndUserId(saveVO.getKqId(), loginUserId );
+        DkDO dkDO = dkMapper.selectByKqIdAndUserId(saveVO.getKqId(), loginUserId);
 
-        if(ObjectUtils.isEmpty(saveVO.getId())){
-            if(ObjectUtils.isNotEmpty(dkDO)){
+        if(ObjectUtils.isEmpty(saveVO.getId())) {
+            if(ObjectUtils.isNotEmpty(dkDO)) {
                 throw exception(ErrorCodeConstants.APP_TASK_RECEIVE_ERROR_RETRY);
             }
 
@@ -297,11 +271,11 @@ public class TaskServiceImpl implements TaskService {
             //新增
             DkDO saveDo = getDkDO(saveVO, loginUserId);
             dkMapper.insert(saveDo);
-        }else{
+        } else {
             //变更
-            if(ObjectUtils.isNotEmpty(dkDO) && dkDO.getId().equals(saveVO.getId())){
+            if(ObjectUtils.isNotEmpty(dkDO) && dkDO.getId().equals(saveVO.getId())) {
                 dkMapper.updateById(BeanUtils.toBean(saveVO, DkDO.class));
-            }else{
+            } else {
                 throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
             }
         }
@@ -314,17 +288,17 @@ public class TaskServiceImpl implements TaskService {
         DkDO saveDo = BeanUtils.toBean(saveVO, DkDO.class);
         saveDo.setId(YitIdHelper.nextId());// 雪花id
         saveDo.setUserId(loginUserId);
-        saveDo.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
         return saveDo;
     }
 
     private void setDkType(TaskDkxxSaveVO saveVO, Long loginUserId) {
         Set<String> roleCodes = permissionApi.getUserRoleCodeListByUserIdFromCache(loginUserId);
+
         if(roleCodes.contains(RoleCodeEnum.PROVINCIAL_VERIFICATION_PERSONNEL.getCode())) {
             saveVO.setDkType(TaskDkxxSaveVO.PROVINCIAL_VERIFICATION_PERSONNEL_DK_TYPE);
-        }else if(roleCodes.contains(RoleCodeEnum.VERIFICATION_PERSONNEL.getCode())) {
+        } else if(roleCodes.contains(RoleCodeEnum.BANK_VERIFICATION_PERSONNEL.getCode())) {
             saveVO.setDkType(TaskDkxxSaveVO.VERIFICATION_PERSONNEL_DK_TYPE);
-        }else{
+        } else {
             throw exception(ErrorCodeConstants.APP_ACCOUNT_PERMISSION_DENIED);
         }
     }
@@ -342,7 +316,8 @@ public class TaskServiceImpl implements TaskService {
             throw exception(ErrorCodeConstants.APP_TASK_RECEIVE_ERROR);
         }
     }
-    private  List<TaskCaxxRespVO> verifyStoreroom(TaskPageReqVO reqVO) {
+
+    private List<TaskCaxxRespVO> verifyStoreroom(TaskPageReqVO reqVO) {
 
         TaskPageReqVO pageReqVO = new TaskPageReqVO();
         pageReqVO.setCaIds(reqVO.getCaIds());
@@ -365,9 +340,9 @@ public class TaskServiceImpl implements TaskService {
         Set<String> roleCodes = permissionApi.getUserRoleCodeListByUserIdFromCache(loginUserId);
 
         // 查询待核验列表
-        if(pageReqVO.getListType() == null){
+        if(pageReqVO.getListType() == null) {
             throw exception(ErrorCodeConstants.APP_PARAM_ERROR);
-        }else if(TaskPageReqVO.LIST_TYPE_TASK1.equals(pageReqVO.getListType())) {
+        } else if(TaskPageReqVO.LIST_TYPE_TASK1.equals(pageReqVO.getListType())) {
             // 可选任务
             pageReqVO.setHyState(DeliveryHyState.WAIT.getCode());
         } else if(TaskPageReqVO.LIST_TYPE_TASK2.equals(pageReqVO.getListType())) {
@@ -400,10 +375,10 @@ public class TaskServiceImpl implements TaskService {
             return;
         }
         // 银行核验人员 | 存粮人
-        if(roleCodes.contains(RoleCodeEnum.VERIFICATION_PERSONNEL.getCode()) ||
+        if(roleCodes.contains(RoleCodeEnum.BANK_VERIFICATION_PERSONNEL.getCode()) ||
                 roleCodes.contains(RoleCodeEnum.GRAIN_DEPOSITOR.getCode())) {
             if(loginUser != null) {
-                pageReqVO.setDeptId(loginUser.getInfo().get("deptId"));
+                pageReqVO.setBankType(loginUser.getInfo().get("bankType"));
                 pageReqVO.setTableName(TaskPageReqVO.TABLE_NAME_DELIVERY_BANK);
             }
             return;

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

@@ -43,8 +43,8 @@
         <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 test="pageReqVO.bankType != null and pageReqVO.bankType != ''">
+            AND FIND_IN_SET(#{pageReqVO.bankType},dp.RDYH_ID)
         </if>
         <if test="pageReqVO.kqIds != null and pageReqVO.kqIds.size() > 0">
             AND dp.KQ_ID IN
@@ -123,8 +123,8 @@
         <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 test="pageReqVO.bankType != null and pageReqVO.bankType != ''">
+            AND FIND_IN_SET(#{pageReqVO.bankType},dp.RDYH_ID)
         </if>
         <if test="pageReqVO.kqIds != null and pageReqVO.kqIds.size() > 0">
             AND dp.KQ_ID IN
@@ -158,8 +158,8 @@
         <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 test="pageReqVO.bankType != null and pageReqVO.bankType != ''">
+            AND FIND_IN_SET(#{pageReqVO.bankType},db.RDYH_ID)
         </if>
         <if test="pageReqVO.clrsfxd != null and pageReqVO.clrsfxd == 0 ">
             AND du.ID IS NULL

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

@@ -19,12 +19,12 @@ public enum RoleCodeEnum {
     PROVINCIAL_VERIFICATION_PERSONNEL("provincial_verification_personnel", "省级核验人员"),
     //    银行用户	bank_users
     BANK_USERS("bank_users", "银行用户"),
+    //银行核验人员 bank_verification_personnel
+    BANK_VERIFICATION_PERSONNEL("bank_verification_personnel", "银行核验人员"),
     //    监管公司	regulatory_company
     REGULATORY_COMPANY("regulatory_company", "监管公司"),
     //    保险公司	insurance_company
     INSURANCE_COMPANY("insurance_company", "保险公司"),
-    //    银行核验人员	verification_personnel
-    VERIFICATION_PERSONNEL("verification_personnel", "银行核验人员"),
     //    存粮人(贷款人) grain_depositor
     GRAIN_DEPOSITOR("grain_depositor", "存粮人(贷款人)"),
     //    省局	sheng_admin