个贷出入库批量增加节点筛选

biz-base/src/main/java/com/dayou/controller/WorkTaskRecordController.java

@@ -177,25 +177,23 @@ public class WorkTaskRecordController extends BaseController {
 
     /**
      * 个贷业务我的待办(入库)
-     * @param todoVO
-     * @param keyword
+     * @param nodeCode
      * @return
      */
     @GetMapping("/personal/inRep/todo")
-    public RestResponse<List<PersonalTodoVO>> personalInRepTodoList(PersonalTodoVO todoVO, String keyword){
-        List<PersonalTodoVO> ret = workTaskRecordService.personalInRepTodoList(todoVO,keyword);
+    public RestResponse<List<PersonalTodoVO>> personalInRepTodoList(String nodeCode){
+        List<PersonalTodoVO> ret = workTaskRecordService.personalInRepTodoList(nodeCode);
         return RestResponse.data(ret);
     }
 
     /**
      * 个贷业务我的待办(出库)
-     * @param todoVO
-     * @param keyword
+     * @param nodeCode
      * @return
      */
     @GetMapping("/personal/outRep/todo")
-    public RestResponse<List<PersonalTodoVO>> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword){
-        List<PersonalTodoVO> ret = workTaskRecordService.personalOutRepTodoList(todoVO,keyword);
+    public RestResponse<List<PersonalTodoVO>> personalOutRepTodoList(String nodeCode){
+        List<PersonalTodoVO> ret = workTaskRecordService.personalOutRepTodoList(nodeCode);
         return RestResponse.data(ret);
     }
 }

dao/src/main/java/com/dayou/mapper/WorkTaskRecordMapper.java

@@ -58,7 +58,7 @@ public interface WorkTaskRecordMapper extends CustomBaseMapper<WorkTaskRecord> {
 
     List<Long> getHandlerIdByLastNode(@Param("businessType")String businessType, @Param("businessId")Long businessId, @Param("businessSubId")String businessSubId, @Param("businessMinId")String businessMinId);
 
-    List<PersonalTodoVO> personalInRepTodoList(@Param("personal") PersonalTodoVO  personal, @Param("keyword")String keyword);
+    List<PersonalTodoVO> personalInRepTodoList(@Param("nodeCode")String nodeCode,@Param("currentUserId") Long currentUserId);
 
-    List<PersonalTodoVO> personalOutRepTodoList(@Param("personal") PersonalTodoVO todoVO, @Param("keyword")String keyword);
+    List<PersonalTodoVO> personalOutRepTodoList(@Param("nodeCode")String nodeCode,@Param("currentUserId") Long currentUserId);
 }

dao/src/main/resources/mapper/WorkTaskRecordMapper.xml

@@ -682,7 +682,7 @@
             )
     </select>
 
-    <select id="personalInRepTodoList"  parameterType="com.dayou.vo.TaskTodoVO" resultType="com.dayou.vo.PersonalTodoVO">
+    <select id="personalInRepTodoList"   resultType="com.dayou.vo.PersonalTodoVO">
         SELECT
         wfni.id,
         wtr.id AS taskId,
@@ -752,15 +752,18 @@
         )
         ) c on c.business_id = p.id
         WHERE
-        wtr.handler_id = #{personal.handlerId}
+        wtr.handler_id = #{currentUserId}
         AND u.deleted = 0
         AND wnt.deleted = 0
         AND wtr.deleted = 0
         AND wfni.code in ('STATEMENT_IN','REPORT_IN','LETTER_IN')
+        <if test="nodeCode!=null and nodeCode!=''">
+            and wfni.code = #{nodeCode}
+        </if>
         order by wfni.modified DESC
     </select>
 
-    <select id="personalOutRepTodoList"  parameterType="com.dayou.vo.TaskTodoVO" resultType="com.dayou.vo.PersonalTodoVO">
+    <select id="personalOutRepTodoList"  resultType="com.dayou.vo.PersonalTodoVO">
         SELECT
             wfni.id,
             wtr.id AS taskId,
@@ -830,11 +833,14 @@
                 )
             ) c on c.business_id = p.id
         WHERE
-            wtr.handler_id = #{personal.handlerId}
+            wtr.handler_id = #{currentUserId}
           AND u.deleted = 0
           AND wnt.deleted = 0
           AND wtr.deleted = 0
           AND wfni.code in ('STATEMENT_OUT','REPORT_OUT','LETTER_OUT')
+            <if test="nodeCode!=null and nodeCode!=''">
+                and wfni.code = #{nodeCode}
+            </if>
         order by wfni.modified DESC
     </select>
 </mapper>

service/src/main/java/com/dayou/service/workflow/IWorkTaskRecordService.java

@@ -73,7 +73,7 @@ public interface IWorkTaskRecordService extends IService<WorkTaskRecord> {
      */
     Long getHandlerIdByLastNode(String businessType,Long businessId,String businessSubId,String businessMinId);
 
-    List<PersonalTodoVO> personalInRepTodoList(PersonalTodoVO todoVO, String keyword);
+    List<PersonalTodoVO> personalInRepTodoList(String nodeCode);
 
-    List<PersonalTodoVO> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword);
+    List<PersonalTodoVO> personalOutRepTodoList(String nodeCode);
 }

service/src/main/java/com/dayou/service/workflow/WorkTaskRecordServiceImpl.java

@@ -195,16 +195,14 @@ public class WorkTaskRecordServiceImpl extends ServiceImpl<WorkTaskRecordMapper,
     }
 
     @Override
-    public List<PersonalTodoVO> personalInRepTodoList(PersonalTodoVO todoVO, String keyword) {
-        todoVO.setHandlerId(LoginContext.getCurrentUserId());
-        List<PersonalTodoVO> ret = workTaskRecordMapper.personalInRepTodoList(todoVO,keyword);
+    public List<PersonalTodoVO> personalInRepTodoList(String nodeCode) {
+        List<PersonalTodoVO> ret = workTaskRecordMapper.personalInRepTodoList(nodeCode,LoginContext.getCurrentUserId());
         return ret;
     }
 
     @Override
-    public List<PersonalTodoVO> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword) {
-        todoVO.setHandlerId(LoginContext.getCurrentUserId());
-        List<PersonalTodoVO> ret = workTaskRecordMapper.personalOutRepTodoList(todoVO,keyword);
+    public List<PersonalTodoVO> personalOutRepTodoList(String nodeCode) {
+        List<PersonalTodoVO> ret = workTaskRecordMapper.personalOutRepTodoList(nodeCode,LoginContext.getCurrentUserId());
         return ret;
     }