|
@@ -45,7 +45,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
|
|
|
CmmsInspectVo inspectVo = CmmsInspectConvert.INSTANCE.convert(cmmInspect);
|
|
|
|
|
|
// 根据 巡检工单表中的 巡检计划id查询出巡检计划的详情
|
|
|
- CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanById(cmmInspect.getInspectplanid());
|
|
|
+ CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanById(cmmInspect.getInspectplanid(),id);
|
|
|
|
|
|
inspectVo.setPlanList(cmmsInspectPlanById.getTaskList());
|
|
|
|
|
@@ -54,7 +54,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid) {
|
|
|
+ public CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid,String inspectid) {
|
|
|
CmmsInspectPlan cmmsInspectPlan = cmmsInspectMapper.getCmmsInspectPlanById(inspectplanid);
|
|
|
CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
|
|
|
|
|
@@ -64,9 +64,9 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
|
|
|
for (int i = 0; i < taskList.size(); i++) {
|
|
|
String relid = taskList.get(i).getRelid();
|
|
|
if ("巡检点".equals(taskList.get(i).getTasktype())){
|
|
|
- taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListByIdA(relid));
|
|
|
+ taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListByIdA(relid,inspectid));
|
|
|
}else {
|
|
|
- taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineByIdA(relid));
|
|
|
+ taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineByIdA(relid,inspectid));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -89,7 +89,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
|
|
|
CmmsInspectVo inspectVo = CmmsInspectConvert.INSTANCE.convert(cmmInspect);
|
|
|
|
|
|
// 根据 巡检工单表中的 巡检计划id查询出巡检计划的详情
|
|
|
- CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanTreeById(cmmInspect.getInspectplanid());
|
|
|
+ CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanTreeById(cmmInspect.getInspectplanid(),id);
|
|
|
|
|
|
inspectVo.setTitle(cmmInspect.getInspectname());
|
|
|
inspectVo.setKey(cmmInspect.getInspectname());
|
|
@@ -100,7 +100,7 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid) {
|
|
|
+ public CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid,String inspectid) {
|
|
|
CmmsInspectPlan cmmsInspectPlan = cmmsInspectMapper.getCmmsInspectPlanById(inspectplanid);
|
|
|
CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
|
|
|
|
|
@@ -114,13 +114,13 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
|
|
|
taskList.get(i).setTitle(name);
|
|
|
taskList.get(i).setKey(name);
|
|
|
//taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid));
|
|
|
- taskList.get(i).setChildren(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid).getChildren());
|
|
|
+ taskList.get(i).setChildren(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid,inspectid).getChildren());
|
|
|
}else {
|
|
|
String name = inspectLineService.getNameById(taskList.get(i).getRelid());
|
|
|
taskList.get(i).setTitle(name);
|
|
|
taskList.get(i).setKey(name);
|
|
|
//taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineTreeByIdA(relid));
|
|
|
- taskList.get(i).setChildren(inspectLineService.getCmmsInspectLineTreeByIdA(relid).getChildren());
|
|
|
+ taskList.get(i).setChildren(inspectLineService.getCmmsInspectLineTreeByIdA(relid,inspectid).getChildren());
|
|
|
}
|
|
|
}
|
|
|
}
|