设置点位

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -517,7 +517,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     public Map<String, Object> scheduleTaskpageList(Map<String, Object>map) {
         String taskBatchNo = map.get("taskBatchNo")==null?"":map.get("taskBatchNo").toString();
         String draftFlag = map.get("draftFlag")==null?"":map.get("draftFlag").toString();
-        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag));
+        String planId = map.get("planId")==null?"":map.get("planId").toString();
+        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId));
         List<String>dateStrList = new ArrayList<>();
         for(TTask t:taskList){
             String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM");
@@ -543,6 +544,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         queryMap.put("size",size);
         queryMap.put("taskBatchNo",taskBatchNo);
         queryMap.put("draftFlag",draftFlag);
+        queryMap.put("planId",planId);
         List<Map> dataList = baseMapper.getTaskList(queryMap);
         int count = baseMapper.getTaskCount(queryMap);
         for(Map m:dataList){
@@ -570,7 +572,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     public Map<String, Object> scheduleTaskDaypageList(Map<String, Object>map) {
         String taskBatchNo = map.get("taskBatchNo")==null?"":map.get("taskBatchNo").toString();
         String draftFlag = map.get("draftFlag")==null?"":map.get("draftFlag").toString();
-        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag));
+        String planId = map.get("planId")==null?"":map.get("planId").toString();
+        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId));
         List<String>dateStrList = new ArrayList<>();
         for(TTask t:taskList){
             String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM-dd");
@@ -596,6 +599,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         queryMap.put("size",size);
         queryMap.put("taskBatchNo",taskBatchNo);
         queryMap.put("draftFlag",draftFlag);
+        queryMap.put("planId",planId);
         List<Map> dataList = baseMapper.getTaskList(queryMap);
         int count = baseMapper.getTaskCount(queryMap);
         for(Map m:dataList){

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -62,6 +62,9 @@
         <if test="orderId != null and orderId != ''">
             and order_id = #{orderId}
         </if>
+        <if test="planId != null and planId != ''">
+            and plan_id = #{planId}
+        </if>
         <if test="draftFlag != null and draftFlag != ''">
             and draft_flag = #{draftFlag}
         </if>