|
@@ -510,7 +510,6 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
|
|
|
|
List<PatrolInspectionContentOption> contentOptionVoList = new ArrayList<>();
|
|
List<PatrolInspectionContentOption> contentOptionVoList = new ArrayList<>();
|
|
for (int i = 0; i < contentOptionList.size(); i++) {
|
|
for (int i = 0; i < contentOptionList.size(); i++) {
|
|
-// ContentOptionVo contentOptionVo = new ContentOptionVo();
|
|
|
|
contentOptionList.get(i).setId(contentOptionList.get(i).getId());
|
|
contentOptionList.get(i).setId(contentOptionList.get(i).getId());
|
|
contentOptionList.get(i).setContentId(contentOptionList.get(i).getContentId());
|
|
contentOptionList.get(i).setContentId(contentOptionList.get(i).getContentId());
|
|
contentOptionList.get(i).setCreateTime(contentOptionList.get(i).getCreateTime());
|
|
contentOptionList.get(i).setCreateTime(contentOptionList.get(i).getCreateTime());
|
|
@@ -532,8 +531,6 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
}
|
|
}
|
|
contentOptionVoList.add(contentOptionList.get(i));
|
|
contentOptionVoList.add(contentOptionList.get(i));
|
|
}
|
|
}
|
|
-// List<PatrolInspectionContentOption> contentOptionListOne = new ArrayList<>();
|
|
|
|
-// contentOptionListOne.addAll(contentOptionVoList);
|
|
|
|
for (int i = 0; i < contentList.size(); i++) {
|
|
for (int i = 0; i < contentList.size(); i++) {
|
|
List<PatrolInspectionContentOption> contentOptionVoListOne = new ArrayList<>();
|
|
List<PatrolInspectionContentOption> contentOptionVoListOne = new ArrayList<>();
|
|
PatrolInspectionContentVo contentVo = new PatrolInspectionContentVo();
|
|
PatrolInspectionContentVo contentVo = new PatrolInspectionContentVo();
|
|
@@ -565,7 +562,6 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
}
|
|
}
|
|
Map<String, Object> map = new HashMap<>();
|
|
Map<String, Object> map = new HashMap<>();
|
|
map.put("contentList", list);
|
|
map.put("contentList", list);
|
|
-// map.put("contentOptionIdList", contentOptionIdList);
|
|
|
|
return map;
|
|
return map;
|
|
}
|
|
}
|
|
|
|
|