管理员修改（上报）

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -547,6 +547,42 @@ public class RuralCostProjectMessageController extends BaseController {
                 consultants.add(bzshbConsultant);
             }
         }
+
+        //查询上报信息表中是否含有数据，没有则进行获取基础数据
+        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReported(projectRecords.getId());
+        if(reported == null){
+            model.addAttribute("reportedFalg", false);
+
+        }else{
+            //根据上报id查询上报咨询员的信息
+            List<RuralReportConsultant> reportedConsultants=ruralProjectMessageService.getReportedConsultantsList(reported.getId());
+            //查询报告咨询员的信息
+            List<RuralReportConsultant> reportConsultants=ruralProjectMessageService.getConsultantsList(projectRecords.getId());
+            List<RuralReportConsultant> consultantLista = Lists.newArrayList();
+            if(reportedConsultants.size() == 0){
+                //如果上报的咨询员信息为空 则处理报告咨询员信息
+                consultantLista = ruralProjectMessageService.disposeConsultant(reportConsultants, projectRecords);
+            }else{
+                //对上报的咨询员进行处理
+                consultantLista = ruralProjectMessageService.disposereportedConsultant(reportedConsultants);
+            }
+            RuralProjectRecords records = projectRecordsService.getQueryProjectUsers(reported.getProjectId());
+            if(StringUtils.isBlank(reported.getProjectRecordId())){
+                reported.setProjectRecordId(records.getProjectId());
+            }
+            model.addAttribute("ruralProjectRecordsReported", reported);
+            projectcontent.setRecordsReported(reported);
+            //查询项目信息
+            model.addAttribute("ruralProjectRecords", records);
+            model.addAttribute("consultantInfo1", consultantLista);
+            if(StringUtils.isBlank(reported.getS1())){
+                reported.setS1("10");
+            }
+            //获取工程类型
+            ProjectEngineeringInfo engineeringInfos=engineeringService.getProjectReportedType(reported.getPorjectUse());
+            model.addAttribute("engineeringInfo", engineeringInfos);
+        }
+
         //查询总审人员信息
         List<User> auditUserList = userService.getAuditUserList();
         ruralProjectRecords.setBzshbUserList(auditUserList);
@@ -559,11 +595,7 @@ public class RuralCostProjectMessageController extends BaseController {
         model.addAttribute("id", projectcontentinfo.getId());
         model.addAttribute("projectcontentinfo", projectcontent);
         model.addAttribute("consultantinfo", consultants);
-        //获取是否含有上报信息
-        RuralProjectRecordsReported reported = ruralProjectMessageService.getRuralProjectRecordsReportedById(projectcontentinfo.getReportedId());
-        if(null != reported){
-            model.addAttribute("reportedView", 1);
-        }
+
         List<MainDictDetail> achievementTypes = DictUtils.getMainDictList("achievement_type");
         if(null != achievementTypes){
             for (MainDictDetail achievementType:achievementTypes) {