河南郸城调度计划修改 详情bug修复

src/main/java/com/shkpr/service/aimodelpower/dbdao/services/WODispatchCmdBatchItemDBServiceImpl.java

@@ -59,7 +59,7 @@ public class WODispatchCmdBatchItemDBServiceImpl implements WODispatchCmdBatchIt
             if(!CollectionUtils.isEmpty(arrRes)){
                 newArrRes = new ArrayList<>();
                 for (int i = 0; i < arrRes.size(); i++) {
-                    DispatchCmdBatchItemModel dispatchCmdBatchItemModel = FastJsonUtil.map2Obj(arrRes.get(0),DispatchCmdBatchItemModel.class,true);
+                    DispatchCmdBatchItemModel dispatchCmdBatchItemModel = FastJsonUtil.map2Obj(arrRes.get(i),DispatchCmdBatchItemModel.class,true);
 
                     //查询相关联的处置建议
                     Map<String,Object> queryMap = new HashMap<>();

src/main/java/com/shkpr/service/aimodelpower/dbdao/services/WODispatchPlanDBServiceImpl.java

@@ -268,27 +268,27 @@ public class WODispatchPlanDBServiceImpl implements WODispatchPlanDBService,WODi
         woDispatchPlanMapper.updateWiths(upMap,andWhereUp,new HashMap<>(),"");
 
         //TODO 先删除所有关联再添加
-//        if(model.getChufaRulsFlag()!=-1) {
-//            Map<String, Object> andWhereRuls = new HashMap<>();
-//            andWhereRuls.put("plan_id", model.getPlanId());
-//            woDispatchPlanRulsMapper.deleteWiths(andWhereRuls, new HashMap<>(), "");
-//            Map<String, Object> andWherePlanTags = new HashMap<>();
-//            andWherePlanTags.put("plan_id", model.getPlanId());
-//            woDispatchPlanTagsMapper.deleteWiths(andWherePlanTags, new HashMap<>(), "");
-//        }
-//        //删除排班
-//        Map<String,Object> andWheresItems = new HashMap<>();
-//        andWheresItems.put("plan_id",model.getPlanId());
-//        List<DispatchCmdBatchItemModel> woMap = woDispatchCmdBatchItemDBService.listAllWithsExByDispoal("","",andWheresItems,new HashMap<>(),"handle_start_time","");
-//        if(!CollectionUtils.isEmpty(woMap)){
-//            for (DispatchCmdBatchItemModel item:woMap){
-//                woDispatchCmdPatchItemMapper.deleteWiths(andWheresItems,new HashMap<>(),"");
-//                //删除对应的处置建议
-//                Map<String,Object> andWheresItemDisposals = new HashMap<>();
-//                andWheresItemDisposals.put("batch_item_id",model.getPlanId());
-//                woDispatchCmdPatchDisposalMapper.deleteWiths(andWheresItemDisposals,new HashMap<>(),"");
-//            }
-//        }
+        if(model.getChufaRulsFlag()!=-1) {
+            Map<String, Object> andWhereRuls = new HashMap<>();
+            andWhereRuls.put("plan_id", model.getPlanId());
+            woDispatchPlanRulsMapper.deleteWiths(andWhereRuls, new HashMap<>(), "");
+            Map<String, Object> andWherePlanTags = new HashMap<>();
+            andWherePlanTags.put("plan_id", model.getPlanId());
+            woDispatchPlanTagsMapper.deleteWiths(andWherePlanTags, new HashMap<>(), "");
+        }
+        //删除排班
+        Map<String,Object> andWheresItems = new HashMap<>();
+        andWheresItems.put("plan_id",model.getPlanId());
+        List<DispatchCmdBatchItemModel> woMap = woDispatchCmdBatchItemDBService.listAllWithsExByDispoal("","",andWheresItems,new HashMap<>(),"handle_start_time","");
+        if(!CollectionUtils.isEmpty(woMap)){
+            for (DispatchCmdBatchItemModel item:woMap){
+                woDispatchCmdPatchItemMapper.deleteWiths(andWheresItems,new HashMap<>(),"");
+                //删除对应的处置建议
+                Map<String,Object> andWheresItemDisposals = new HashMap<>();
+                andWheresItemDisposals.put("batch_item_id",model.getPlanId());
+                woDispatchCmdPatchDisposalMapper.deleteWiths(andWheresItemDisposals,new HashMap<>(),"");
+            }
+        }
 
         if(model.getChufaRulsFlag()==1) {
             for (JPDispatchPlanInfoRuleSave jp : rulesList) {