【功能修改】app 端:存粮人相关接口 调整

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

@@ -33,8 +33,9 @@ public class TaskController {
         return success(taskService.getTaskList(pageReqVO));
     }
     @PostMapping("/getAllStoreroomList")
-    @Operation(summary = "获取存粮人可以 选择的交收库列表(存粮人)")
+    @Operation(summary = "获取存粮人可以选择的交收库列表(存粮人)")
     public CommonResult<IPage<TaskRespVO>> getAllStoreroomList(@Valid @RequestBody TaskPageReqVO pageReqVO) {
+        pageReqVO.setListType(TaskPageReqVO.LIST_TYPE_TASK3);
         return success(taskService.getAllStoreroomList(pageReqVO));
     }
     @PostMapping("/getMyStoreroomList")

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

@@ -33,6 +33,12 @@ public class TaskRespVO {
     @Schema(description = "库区地址-县")
     private String xian;
 
+    @Schema(description = "库区负责人")
+    private String kqfzr;
+
+    @Schema(description = "联系电话")
+    private String lxdh;
+
     @Schema(description = "核验人员ID(SYSTEM_USERS.ID)")
     private Long hyryId;
 

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

@@ -232,9 +232,10 @@ public class TaskServiceImpl implements TaskService {
 
         KqxxDO kqxxDO = kqxxMapper.selectById(reqVO.getKqId());
 
-        DwxxDO dwxxDO = dwxxMapper.selectById(kqxxDO.getDwid());
-
         if(ObjectUtils.isNotEmpty(kqxxDO)) {
+
+            DwxxDO dwxxDO = dwxxMapper.selectById(kqxxDO.getDwid());
+
             TaskKqxxRespVO kqxx = BeanUtils.toBean(kqxxDO, TaskKqxxRespVO.class);
             kqxx.setDwmc(dwxxDO.getDwmc());
             kqxx.setTyxydm(dwxxDO.getTyxydm());

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

@@ -17,6 +17,7 @@
             dk.KQMC ,
             dk.JTDZ ,
             dk.SHENG ,dk.SHI ,dk.XIAN ,
+            dk.KQFZR , dk.LXDH ,
             dp.HYRY_ID ,
             dp.HYRY_NAME ,
             dp.HY_STATE ,
@@ -43,7 +44,7 @@
             AND dp.HYRY_ID = #{pageReqVO.hyryId}
         </if>
         <if test="pageReqVO.deptId != null and pageReqVO.deptId != ''">
-            AND FIND_IN_SET(pageReqVO.deptId,dp.RDYH_ID)
+            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
@@ -63,6 +64,7 @@
         dk.KQMC ,
         dk.JTDZ ,
         dk.SHENG ,dk.SHI ,dk.XIAN ,
+        dk.KQFZR , dk.LXDH ,
         COUNT(distinct dc.ID) AS HY_NUM
         FROM
         DELIVERY_USERS du
@@ -93,6 +95,7 @@
         dk.KQMC ,
         dk.JTDZ ,
         dk.SHENG ,dk.SHI ,dk.XIAN ,
+        dk.KQFZR , dk.LXDH ,
         dp.HYRY_ID ,
         dp.HYRY_NAME ,
         dp.HY_STATE ,
@@ -121,7 +124,7 @@
             AND dp.HYRY_ID = #{pageReqVO.hyryId}
         </if>
         <if test="pageReqVO.deptId != null and pageReqVO.deptId != ''">
-            AND FIND_IN_SET(pageReqVO.deptId,dp.RDYH_ID)
+            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
@@ -156,7 +159,7 @@
             AND dk.ID = #{pageReqVO.kqId}
         </if>
         <if test="pageReqVO.deptId != null and pageReqVO.deptId != ''">
-            AND FIND_IN_SET(pageReqVO.deptId,dp.RDYH_ID)
+            AND FIND_IN_SET(#{pageReqVO.deptId},dp.RDYH_ID)
         </if>
         <if test="pageReqVO.clrsfxd != null and pageReqVO.clrsfxd == 0 ">
             AND du.ID IS NULL