Browse Source

河南郸城调度计划列表 详情接口bug修复

1037015548@qq.com 11 months ago
parent
commit
154ddd3822

+ 1 - 1
src/main/java/com/shkpr/service/aimodelpower/bizmgr/WODispatchPlanTmDoBizFun.java

@@ -331,7 +331,7 @@ public class WODispatchPlanTmDoBizFun {
                         model.setRulsModels(FastJsonUtil.batchMap2Obj(rulsModels,DispatchPlanInfoRuleModel.class,true));
                         model.setRulsModels(FastJsonUtil.batchMap2Obj(rulsModels,DispatchPlanInfoRuleModel.class,true));
                     }
                     }
                     if(!CollectionUtils.isEmpty(tagModels)){
                     if(!CollectionUtils.isEmpty(tagModels)){
-                        model.setItemModels(FastJsonUtil.batchMap2Obj(tagModels,DispatchCmdBatchItemModel.class,true));
+                        model.setTagsList(FastJsonUtil.batchMap2Obj(tagModels,DispatchPlanInfoTagsModel.class,true));
                     }
                     }
                     if(!CollectionUtils.isEmpty(itemModels)) {
                     if(!CollectionUtils.isEmpty(itemModels)) {
                         model.setItemModels(itemModels);
                         model.setItemModels(itemModels);

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

@@ -64,7 +64,7 @@ public class WODispatchCmdBatchItemDBServiceImpl implements WODispatchCmdBatchIt
                     //查询相关联的处置建议
                     //查询相关联的处置建议
                     Map<String,Object> queryMap = new HashMap<>();
                     Map<String,Object> queryMap = new HashMap<>();
                     queryMap.put(R_INFO.PRIMARY_KEY,arrRes.get(i).get(R_INFO.PRIMARY_KEY));
                     queryMap.put(R_INFO.PRIMARY_KEY,arrRes.get(i).get(R_INFO.PRIMARY_KEY));
-                    List<Map<String,Object>> disposalMapList = woDispatchCmdPatchDisposalMapper.listAllWiths("","",1,0,queryMap,new HashMap<>(),"","");
+                    List<Map<String,Object>> disposalMapList = woDispatchCmdPatchDisposalMapper.batchQueryWiths("","",queryMap,new HashMap<>(),"","");
                     List<DispatchCmdBatchDispoalModel> dispoalModels = new ArrayList<>();
                     List<DispatchCmdBatchDispoalModel> dispoalModels = new ArrayList<>();
                     if(!CollectionUtils.isEmpty(disposalMapList)){
                     if(!CollectionUtils.isEmpty(disposalMapList)){
                         dispoalModels = FastJsonUtil.batchMap2Obj(disposalMapList,DispatchCmdBatchDispoalModel.class,true);
                         dispoalModels = FastJsonUtil.batchMap2Obj(disposalMapList,DispatchCmdBatchDispoalModel.class,true);