计划

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

@@ -517,6 +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();
+        //参数放置位置处理
+        getQueryMap(map);
         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<>();
@@ -572,6 +574,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();
+        //参数放置位置处理
+        getQueryMap(map);
         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<>();
@@ -825,4 +829,17 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         paramMap.put(DemoLineConstant.DEMOLINE_CHANGEHAND_FLAG, "1");
         return paramMap;
     }
+
+
+    private Map getQueryMap(Map map){
+        Map modelMap = map.get("model")==null?null:(Map)map.get("model");
+        if(modelMap!=null){
+            for(Object key:modelMap.keySet()){
+                map.put(key.toString(),modelMap.get(key));
+            }
+        }
+        return map;
+
+
+    }
 }

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

@@ -84,6 +84,12 @@
         <if test="deliveryTimeEnd != null  and deliveryTimeEnd != '' ">
             AND b.pdeliveryTime <![CDATA[ <= ]]> #{deliveryTimeEnd}
         </if>
+<!--        <if test="id != null ">-->
+<!--            and a.id = #{id}-->
+<!--        </if>-->
+<!--        <if test="planStatus != null and planStatus != ''">-->
+<!--            and a.plan_status #{planStatus}-->
+<!--        </if>-->
         ) s ${ew.customSqlSegment}
     </select>