移动端-巡检计划检查项查询

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanSonServiceImpl.java

@@ -561,16 +561,38 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
                     contentVo.setCreateTime(contentList.get(i).getCreateTime());
                     contentVo.setEnable(contentList.get(i).getEnable());
                     contentVo.setCompanyId(contentList.get(i).getCompanyId());
-                    contentVo.setContentOptionListValue1(contentOptionIdList);
-                    for (int j = 0; j < contentOptionVoList.size(); j++) {
-                        int id1 = contentList.get(i).getId();
-                        int id2 = contentOptionVoList.get(j).getContentId();
-                        if (id1 == id2) {
-                            if (contentOptionVoList.get(j).getRemarks() != null && !"".equals(contentOptionVoList.get(j).getRemarks())) {
-                                contentVo.setRemarks(contentOptionVoList.get(j).getRemarks());
+                    contentVo.setContentOptionValue(contentOptionIdList);
+
+                    if (contentList.get(i).getSubmissionMethod()==3){
+                        for (int j = 0; j < recordOptionList.size(); j++) {
+                            if (recordOptionList.get(j).getContentOptionId()==null||recordOptionList.get(j).getContentOptionId()==0){
+                                int id11 = contentList.get(i).getId();
+                                int id22 = recordOptionList.get(j).getContentId();
+                                if (id11==id22){
+                                    if (recordOptionList.get(j).getRemarks() != null && !"".equals(recordOptionList.get(j).getRemarks())) {
+                                        contentVo.setRemarks(recordOptionList.get(j).getRemarks());
+                                    }
+                                    contentVo.setContent(recordOptionList.get(j).getContent());
+//                                    PatrolInspectionContentOption contentOptionVo = new PatrolInspectionContentOption();
+//                                    contentOptionVo.setContentId(recordOptionList.get(j).getContentId());
+//                                    contentOptionVo.setContent(recordOptionList.get(j).getContent());
+//                                    contentOptionVo.setRemarks(recordOptionList.get(j).getRemarks());
+//                                    contentOptionVoListOne.add(contentOptionVo);
+//                                    contentVo.setContentOptionList(contentOptionVoListOne);
+                                }
+                            }
+                        }
+                    }else {
+                        for (int j = 0; j < contentOptionVoList.size(); j++) {
+                            int id1 = contentList.get(i).getId();
+                            int id2 = contentOptionVoList.get(j).getContentId();
+                            if (id1 == id2) {
+                                if (contentOptionVoList.get(j).getRemarks() != null && !"".equals(contentOptionVoList.get(j).getRemarks())) {
+                                    contentVo.setRemarks(contentOptionVoList.get(j).getRemarks());
+                                }
+                                contentOptionVoListOne.add(contentOptionVoList.get(j));
+                                contentVo.setContentOptionList(contentOptionVoListOne);
                             }
-                            contentOptionVoListOne.add(contentOptionVoList.get(j));
-                            contentVo.setContentOptionList(contentOptionVoListOne);
                         }
                     }
                     list.add(contentVo);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/PatrolInspectionContentVo.java

@@ -90,12 +90,17 @@ public class PatrolInspectionContentVo implements Serializable {
     /**
      * 选中项
      */
-    private List<Integer> contentOptionListValue1;
+    private List<Integer> contentOptionValue;
 
     /**
      * 备注
      */
     private String remarks;
 
+    /**
+     * 内容
+     */
+    private String content;
+
 
 }