批量出入库，批量装订盖章添加筛选

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

@@ -181,8 +181,8 @@ public class WorkTaskRecordController extends BaseController {
      * @return
      */
     @GetMapping("/personal/inRep/todo")
-    public RestResponse<List<PersonalTodoVO>> personalInRepTodoList(String nodeCode){
-        List<PersonalTodoVO> ret = workTaskRecordService.personalInRepTodoList(nodeCode);
+    public RestResponse<List<PersonalTodoVO>> personalInRepTodoList(String nodeCode,String clientName){
+        List<PersonalTodoVO> ret = workTaskRecordService.personalInRepTodoList(nodeCode,clientName);
         return RestResponse.data(ret);
     }
 
@@ -192,8 +192,8 @@ public class WorkTaskRecordController extends BaseController {
      * @return
      */
     @GetMapping("/personal/outRep/todo")
-    public RestResponse<List<PersonalTodoVO>> personalOutRepTodoList(String nodeCode){
-        List<PersonalTodoVO> ret = workTaskRecordService.personalOutRepTodoList(nodeCode);
+    public RestResponse<List<PersonalTodoVO>> personalOutRepTodoList(String nodeCode,String clientName){
+        List<PersonalTodoVO> ret = workTaskRecordService.personalOutRepTodoList(nodeCode,clientName);
         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("nodeCode")String nodeCode,@Param("currentUserId") Long currentUserId);
+    List<PersonalTodoVO> personalInRepTodoList(@Param("nodeCode")String nodeCode,@Param("currentUserId") Long currentUserId,@Param("clientName") String clientName);
 
-    List<PersonalTodoVO> personalOutRepTodoList(@Param("nodeCode")String nodeCode,@Param("currentUserId") Long currentUserId);
+    List<PersonalTodoVO> personalOutRepTodoList(@Param("nodeCode")String nodeCode,@Param("currentUserId") Long currentUserId,@Param("clientName") String clientName);
 }

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

@@ -382,6 +382,9 @@
         <if test="personal != null and personal.getNodeIsBookbindingStamp">
             AND (wfni.code = 'STATEMENT_BOOKBINDING_STAMP' OR wfni.code = 'REPORT_BOOKBINDING_STAMP' OR wfni.code = 'LETTER_BOOKBINDING_STAMP')
         </if>
+        <if test="personal!=null and personal.nodeCode!=null and personal.nodeCode!=''">
+            and wfni.code = #{personal.nodeCode}
+        </if>
         order by wfni.modified DESC
     </select>
 
@@ -774,6 +777,9 @@
         <if test="nodeCode!=null and nodeCode!=''">
             and wfni.code = #{nodeCode}
         </if>
+        <if test="clientName!=null and clientName!=''">
+            and cc.name like concat('%',#{clientName},'%')
+        </if>
         order by wfni.modified DESC
     </select>
 
@@ -855,6 +861,9 @@
             <if test="nodeCode!=null and nodeCode!=''">
                 and wfni.code = #{nodeCode}
             </if>
+        <if test="clientName!=null and clientName!=''">
+            and cc.name like concat('%',#{clientName},'%')
+        </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(String nodeCode);
+    List<PersonalTodoVO> personalInRepTodoList(String nodeCode,String clientName);
 
-    List<PersonalTodoVO> personalOutRepTodoList(String nodeCode);
+    List<PersonalTodoVO> personalOutRepTodoList(String nodeCode,String clientName);
 }

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

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