新增报告咨询员，项目负责人添加进去

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

@@ -184,6 +184,48 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if(null == projectcontentinfo.getProjectReportData().getPrincipal()){
             projectcontentinfo.getProjectReportData().setPrincipal(UserUtils.getUser());
         }
+        List<RuralReportConsultant> consultants = Lists.newArrayList();
+        //将自己添加到咨询员数据中
+        //根据用户查询技能信息
+        RuralReportConsultant currentConsultant = new RuralReportConsultant();
+        List<WorkStaffCertificate> userCertificateList = Lists.newArrayList();
+        if(StringUtils.isNotBlank(records.getProjectMasterId())){
+            userCertificateList = ruralProjectMessageService.getCertificateByUser(records.getProjectMasterId());
+        }
+        //获取专业类型
+        List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
+        for (WorkStaffCertificate certificateInfo: userCertificateList) {
+            currentConsultant.setZhucezigezhID(certificateInfo.getNum());
+            for (MainDictDetail type : certificateMajor) {
+                if(certificateInfo.getMajor().equals(type.getValue())){
+                    currentConsultant.setMajor(type.getLabel());
+                }
+            }
+            User currentUser=userService.get(records.getProjectMasterId());
+            currentConsultant.setZixunyuanName(currentUser.getName());
+            consultants.add(currentConsultant);
+        }
+        //根据项目id查找报告咨询员信息
+        List<RuralReportConsultant> consultantList = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
+        for (RuralReportConsultant consultant:consultantList){
+            //根据用户查询技能信息
+            List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+            for (WorkStaffCertificate certificateInfo: certificateList) {
+                if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+                    consultant.setZhucezigezhID(certificateInfo.getNum());
+                }
+                for (MainDictDetail type : certificateMajor) {
+                    if(certificateInfo.getMajor().equals(type.getValue())){
+                        consultant.setMajor(type.getLabel());
+                    }
+                }
+            }
+            User user=userService.get(consultant.getZixunyuan());
+            consultant.setZixunyuanName(user.getName());
+        }
+        consultants.addAll(consultantList);
+        model.addAttribute("info", consultants);
+
         //添加当前文件服务器类型
         projectcontentinfo.setUploadMode(uploadMode);
         model.addAttribute("projectRecords", records);