修改查询任务单历史

src/main/java/com/yxproject/start/mapper/TaskListMapper.java

@@ -371,9 +371,9 @@ public interface TaskListMapper {
             "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO,task.work_group from group_no left join task on group_no.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE" +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "where  1= 1 and to_char(PUNCHING_DATE,'yyyyMMdd')= #{date}\n" +
+            "where  1= 1 and task.work_group =#{workGroup} and to_char(PUNCHING_DATE,'yyyyMMdd')= #{date}\n" +
             "order by group_no.GROUP_NO")
-    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common5(@Param("date")String date );
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common5(@Param("date")String date,@Param("workGroup")String workGroup );
 
     /**
      * 任务单查询历史
@@ -645,9 +645,9 @@ public interface TaskListMapper {
             "left join task on special_card.task_id= task.TASK_ID \n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE  " +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "where SPECIAL_CARD.SPECIAL_TYPE =2" +
+            "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.work_group = #{workGroup}" +
             " and to_char(PUNCHING_DATE,'yyyyMMdd') =#{date}  order by SPECIAL_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast5(@Param("date") String date);
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_fast5(@Param("date") String date,@Param("workGroup")String workGroup);
 
 
     /**
@@ -958,9 +958,9 @@ public interface TaskListMapper {
             "left join task on special_card.task_id= task.TASK_ID \n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "where SPECIAL_CARD.SPECIAL_TYPE =1 " +
+            "where SPECIAL_CARD.SPECIAL_TYPE =1 and task.work_group =#{workGroup} " +
             " and to_char(PUNCHING_DATE,'yyyyMMdd') =#{date} order by SPECIAL_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind5(@Param("date") String date);
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind5(@Param("date") String date,@Param("workGroup") String workGroup);
 
     /**
      * 任务单查询历史
@@ -975,8 +975,8 @@ public interface TaskListMapper {
             "left join task on FAILED_CARD.task_id= task.TASK_ID \n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
-            "where  to_char(FAILED_CARD.FINISH_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed5(@Param("date") String date);
+            "where  to_char(FAILED_CARD.FINISH_DATE,'yyyyMMdd') = #{date} and  FAILED_CARD.work_group =#{workGroup} order by FAILED_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed5(@Param("date") String date,@Param("workGroup") String workGroup);
 
 
     /**

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -476,13 +476,13 @@ public class TaskListServiceImpl implements TaskListService {
                 break;
             case 5:
                 //查询历史任务单 大批证
-                mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common5(date);
+                mapList = taskListMapper.selectHistoryTaskAtAuxiliary_common5(date,workGroup);
                 //查询历史任务单 快证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(date));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast5(date,workGroup));
                 //查询历史任务单 余证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(date));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind5(date,workGroup));
                 //查询历史任务单 废证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed5(date));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed5(date,workGroup));
                 break;
             default:
                 break;