1.二维码下载按钮，若报告号未生成则给出提示

2.新增报告总审驳回页面，不应对数据做验证
3.新增报告总审审批页面展示质量流程控制信息历史数据

src/main/java/com/jeeplus/modules/projectcontentinfo/dao/ProjectcontentinfoDao.java

@@ -13,6 +13,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectcontentinfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.workcontent.entity.WorkContentClaim;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -102,4 +103,11 @@ public interface ProjectcontentinfoDao extends CrudDao<Projectcontentinfo> {
 	 * @return
 	 */
 	List<RuralReportConsultant> findByProjectId(@Param("projectId") String projectId);
-}
+
+	/**
+	 * 根据用户查询技能信息
+	 * @param userId
+	 * @return
+	 */
+	List<WorkStaffCertificate> getCertificateByUser(@Param("userId") String userId);
+}

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -325,6 +325,22 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 
 	@Transactional(readOnly = false)
 	public void save(ProjectReportData projectReportData) {
+		if(StringUtils.isNotBlank(projectReportData.getConsultantRemarks())){
+			while (projectReportData.getConsultantRemarks().endsWith(",")){
+				projectReportData.setConsultantRemarks(projectReportData.getConsultantRemarks().substring(0,projectReportData.getConsultantRemarks().length()-1));
+			}
+		}
+		if(StringUtils.isNotBlank(projectReportData.getPrincipalRemarks())){
+			while(projectReportData.getPrincipalRemarks().endsWith(",")){
+				projectReportData.setPrincipalRemarks(projectReportData.getPrincipalRemarks().substring(0,projectReportData.getPrincipalRemarks().length()-1));
+			}
+		}
+		if(StringUtils.isNotBlank(projectReportData.getTechnicistRemarks())){
+			while(projectReportData.getTechnicistRemarks().endsWith(",")){
+				projectReportData.setTechnicistRemarks(projectReportData.getTechnicistRemarks().substring(0,projectReportData.getTechnicistRemarks().length()-1));
+			}
+		}
+
 		if (projectReportData.getIsNewRecord()){
 			projectReportData.preInsert();
 			projectReportData.setCreateDate(new Date());
@@ -1585,4 +1601,4 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 		List<RuralReportConsultant> consultantList = dao.getConsultantList(projectId);
 		return consultantList;
 	}
-}
+}

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralReportConsultant.java

@@ -11,6 +11,7 @@ public class RuralReportConsultant extends DataEntity<RuralReportConsultant> {
     private String zixunyuan;       //咨询员
     private String zixunyuanName;       //咨询员(录入)
     private String zhucezigezhID;  //注册/资格证号
+    private String zhucezigezhKey;  //注册/资格证号key键
     private String zhucezigezh;  //资格证
     private String major;           //专业
     private String wordnr;          //本人复制内容
@@ -80,4 +81,11 @@ public class RuralReportConsultant extends DataEntity<RuralReportConsultant> {
         this.projectId = projectId;
     }
 
+    public String getZhucezigezhKey() {
+        return zhucezigezhKey;
+    }
+
+    public void setZhucezigezhKey(String zhucezigezhKey) {
+        this.zhucezigezhKey = zhucezigezhKey;
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -64,6 +64,7 @@ import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workreview.dao.WorkReviewAuditDao;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.IdentityService;
@@ -766,6 +767,22 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
      */
     @Transactional(readOnly = false)
     public String auditSave(ProjectReportData reportData,List<User> auditUsers) {
+
+        if(StringUtils.isNotBlank(reportData.getConsultantRemarks())){
+            while (reportData.getConsultantRemarks().endsWith(",")){
+                reportData.setConsultantRemarks(reportData.getConsultantRemarks().substring(0,reportData.getConsultantRemarks().length()-1));
+            }
+        }
+        if(StringUtils.isNotBlank(reportData.getPrincipalRemarks())){
+            while(reportData.getPrincipalRemarks().endsWith(",")){
+                reportData.setPrincipalRemarks(reportData.getPrincipalRemarks().substring(0,reportData.getPrincipalRemarks().length()-1));
+            }
+        }
+        if(StringUtils.isNotBlank(reportData.getTechnicistRemarks())){
+            while(reportData.getTechnicistRemarks().endsWith(",")){
+                reportData.setTechnicistRemarks(reportData.getTechnicistRemarks().substring(0,reportData.getTechnicistRemarks().length()-1));
+            }
+        }
         String flag = reportData.getAct().getFlag();
         // 对不同环节的业务逻辑进行操作
         Act act = reportData.getAct();
@@ -1132,6 +1149,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         }
         projectReportData.setTechnicist(reportData.getTechnicist());
         projectReportData.setTechnicistRemarks(reportData.getTechnicistRemarks());
+        projectReportData.setConsultantRemarks(reportData.getConsultantRemarks());
+        projectReportData.setPrincipalRemarks(reportData.getPrincipalRemarks());
         projectReportDataDao.update(projectReportData);
         return "保存审核意见成功！";
     }
@@ -2713,4 +2732,14 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         List<RuralReportConsultant> list=projectcontentinfoDao.findByProjectId(projectId);
         return list;
     }
+
+    /**
+     * 根据用户查询技能信息
+     * @param projectId
+     * @return
+     */
+    public List<WorkStaffCertificate> getCertificateByUser(String userId){
+        List<WorkStaffCertificate> list=projectcontentinfoDao.getCertificateByUser(userId);
+        return list;
+    }
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -1707,7 +1707,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 //		approvalMoney = 2;
 		String money=projectcontentinfo.getProject().getSubmitMoney();
 		Integer approvalMoney=null;
-		if(null==money){
+		if(StringUtils.isBlank(money)){
 			approvalMoney=1;
 		}else{
 			approvalMoney=Integer.parseInt(money);
@@ -1949,4 +1949,4 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		map.put("data",treeList);
 		return map;
 	}
-}
+}

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

@@ -208,7 +208,7 @@ public class RuralCostProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=projectcontentinfo.getProject().getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -470,12 +470,23 @@ public class RuralCostProjectMessageController extends BaseController {
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         projectReportData = projectReportDataService.get(projectReportData.getId());
         RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
+            ruralProjectRecords.setProjectMasterId(projectReportData.getPrincipal().getId());
+            ruralProjectRecords.setProjectMasterName(projectReportData.getPrincipal().getName());
+        }
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
         projectcontent.setProjectReportData(projectReportData);
 
         //根据项目id查找报告咨询员信息
         List<RuralReportConsultant> consultants = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
         for (RuralReportConsultant consultant:consultants){
+            //根据用户查询技能信息
+            List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+            for (WorkStaffCertificate certificateInfo: certificateList) {
+                if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+                    consultant.setZhucezigezhID(certificateInfo.getNum());
+                }
+            }
             User user=userService.get(consultant.getZixunyuan());
             consultant.setZixunyuanName(user.getName());
         }
@@ -501,7 +512,7 @@ public class RuralCostProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -703,7 +714,7 @@ public class RuralCostProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=records.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -980,7 +991,7 @@ public class RuralCostProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -1084,7 +1095,7 @@ public class RuralCostProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);

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

@@ -47,6 +47,7 @@ import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -219,7 +220,7 @@ public class RuralProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=projectcontentinfo.getProject().getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -479,11 +480,22 @@ public class RuralProjectMessageController extends BaseController {
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         projectReportData = projectReportDataService.get(projectReportData.getId());
         RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
+        if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
+            ruralProjectRecords.setProjectMasterId(projectReportData.getPrincipal().getId());
+            ruralProjectRecords.setProjectMasterName(projectReportData.getPrincipal().getName());
+        }
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
         projectcontent.setProjectReportData(projectReportData);
         //根据项目id查找报告咨询员信息
         List<RuralReportConsultant> consultants = ruralProjectMessageService.getConsultantsList(projectcontentinfo.getProjectId());
         for (RuralReportConsultant consultant:consultants){
+            //根据用户查询技能信息
+            List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+            for (WorkStaffCertificate certificateInfo: certificateList) {
+                if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+                    consultant.setZhucezigezhID(certificateInfo.getNum());
+                }
+            }
             User user=userService.get(consultant.getZixunyuan());
             consultant.setZixunyuanName(user.getName());
         }
@@ -508,7 +520,7 @@ public class RuralProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -596,6 +608,13 @@ public class RuralProjectMessageController extends BaseController {
             //根据项目id查找咨询员信息
             List<RuralReportConsultant> consultantList=ruralProjectMessageService.getConsultantsList(projectcontentinfo1.getProject().getId());
             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());
+                    }
+                }
                 User user=userService.get(consultant.getZixunyuan());
                 consultant.setZixunyuanName(user.getName());
             }
@@ -720,7 +739,7 @@ public class RuralProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=records.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -1003,7 +1022,7 @@ public class RuralProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -1106,7 +1125,7 @@ public class RuralProjectMessageController extends BaseController {
 //        approvalMoney = 2;
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);

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

@@ -262,7 +262,7 @@ public class RuralProjectViewController extends BaseController {
 //        approvalMoney = 2;
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);
@@ -557,7 +557,7 @@ public class RuralProjectViewController extends BaseController {
 //        approvalMoney = 2;
         String money=ruralProjectRecords.getSubmitMoney();
         Integer approvalMoney=null;
-        if(null==money){
+        if(StringUtils.isBlank(money)){
             approvalMoney=1;
         }else{
             approvalMoney=Integer.parseInt(money);

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -128,7 +128,7 @@ public class WorkFullManageController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 项目登记列表页面
 	 */
@@ -334,7 +334,7 @@ public class WorkFullManageController extends BaseController {
 		}*/
 		return "redirect:"+Global.getAdminPath()+"/workfullmanage/workFullManage/?repage";
 	}
-	
+
 	/**
 	 * 批量删除项目登记
 	 */
@@ -350,7 +350,7 @@ public class WorkFullManageController extends BaseController {
 		addMessage(redirectAttributes, "删除项目登记成功");
 		return "redirect:"+Global.getAdminPath()+"/workfullmanage/workFullManage/?repage";
 	}
-	
+
 	/**
 	 * 导出excel文件
 	 */
@@ -400,7 +400,7 @@ public class WorkFullManageController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/workfullmanage/workFullManage/?repage";
     }
-	
+
 	/**
 	 * 下载导入项目登记数据模板
 	 */
@@ -409,7 +409,7 @@ public class WorkFullManageController extends BaseController {
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
             String fileName = "项目登记数据导入模板.xlsx";
-    		List<WorkFullManage> list = Lists.newArrayList(); 
+    		List<WorkFullManage> list = Lists.newArrayList();
     		new ExportExcel("项目登记数据", WorkFullManage.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
@@ -879,12 +879,24 @@ public class WorkFullManageController extends BaseController {
 		List<RuralReportConsultant> consultantList = projectReportDataService.getConsultantList(ruralProjectRecords.getId());
 		//根据 职业资格名称查询字典表并比对当前人员是否已添加该职业资格信息
 		List<MainDictDetail> certificateType = DictUtils.getMainDictList("certificate_type");
+		//获取专业类型
+		List<MainDictDetail> certificateMajor = DictUtils.getMainDictList("certificate_major");
 		for (RuralReportConsultant entity: consultantList) {
 			for (MainDictDetail type : certificateType) {
 				if(entity.getZhucezigezhID().equals(type.getValue())){
 					entity.setZhucezigezh(type.getLabel());
+					break;
 				}
 			}
+			for (MainDictDetail type : certificateMajor) {
+				if(entity.getMajor().equals(type.getValue())){
+					entity.setMajor(type.getLabel());
+					break;
+				}
+			}
+			if(StringUtils.isBlank(entity.getZhucezigezh())){
+				entity.setZhucezigezh("");
+			}
 		}
 
 		List<MainDictDetail> mainDictList = Lists.newArrayList();
@@ -963,30 +975,57 @@ public class WorkFullManageController extends BaseController {
 				data.put("consultantQualification"+i,"");
 			}
 		}
+		if(null != projectReportData.getPrincipalDate()){
+			Map consultantMap = dateCalendar(projectReportData.getConsultantDate());
+			//专业咨询员
+			data.put("consultantName",projectReportData.getConsultant().getName());
+			data.put("consultantRemarks",projectReportData.getConsultantRemarks());
+			data.put("consultantYear",consultantMap.get("year"));
+			data.put("consultantMonth",consultantMap.get("month"));
+			data.put("consultantDay",consultantMap.get("day"));
+		}else{
+			//专业咨询员
+			data.put("consultantName","");
+			data.put("consultantRemarks","");
+			data.put("consultantYear","");
+			data.put("consultantMonth","");
+			data.put("consultantDay","");
+		}
+
+		if(null != projectReportData.getPrincipalDate()){
+			Map principalMap = dateCalendar(projectReportData.getPrincipalDate());
+			//项目负责人
+			data.put("projectMaster",projectReportData.getPrincipal().getName());
+			data.put("projectMasterRemarks",projectReportData.getPrincipalRemarks());
+			data.put("projectYear",principalMap.get("year"));
+			data.put("projectMonth",principalMap.get("month"));
+			data.put("projectDay",principalMap.get("day"));
+		}else{
+			//项目负责人
+			data.put("projectMaster","");
+			data.put("projectMasterRemarks","");
+			data.put("projectYear","");
+			data.put("projectMonth","");
+			data.put("projectDay","");
+		}
+
+		if(null != projectReportData.getTechnicistDate()){
+			Map technicistMap = dateCalendar(projectReportData.getTechnicistDate());
+			//技术负责人
+			data.put("technicistName",projectReportData.getTechnicist().getName());
+			data.put("technicistRemarks",projectReportData.getTechnicistRemarks());
+			data.put("technicistYear",technicistMap.get("year"));
+			data.put("technicistMonth",technicistMap.get("month"));
+			data.put("technicistDay",technicistMap.get("day"));
+		}else{
+			//技术负责人
+			data.put("technicistName","");
+			data.put("technicistRemarks","");
+			data.put("technicistYear","");
+			data.put("technicistMonth","");
+			data.put("technicistDay","");
+		}
 
-		Map consultantMap = dateCalendar(projectReportData.getConsultantDate());
-		//专业咨询员
-		data.put("consultantName",projectReportData.getConsultant().getName());
-		data.put("consultantRemarks",projectReportData.getConsultantRemarks());
-		data.put("consultantYear",consultantMap.get("year"));
-		data.put("consultantMonth",consultantMap.get("month"));
-		data.put("consultantDay",consultantMap.get("day"));
-
-		Map principalMap = dateCalendar(projectReportData.getPrincipalDate());
-		//项目负责人
-		data.put("projectMaster",projectReportData.getPrincipal().getName());
-		data.put("projectMasterRemarks",projectReportData.getPrincipalRemarks());
-		data.put("projectYear",principalMap.get("year"));
-		data.put("projectMonth",principalMap.get("month"));
-		data.put("projectDay",principalMap.get("day"));
-
-		Map technicistMap = dateCalendar(projectReportData.getTechnicistDate());
-		//技术负责人
-		data.put("technicistName",projectReportData.getTechnicist().getName());
-		data.put("technicistRemarks",projectReportData.getTechnicistRemarks());
-		data.put("technicistYear",technicistMap.get("year"));
-		data.put("technicistMonth",technicistMap.get("month"));
-		data.put("technicistDay",technicistMap.get("day"));
 
 		//模板对象
 		Template template=null;
@@ -1036,4 +1075,4 @@ public class WorkFullManageController extends BaseController {
 		map.put("day",day.toString());
 		return map;
 	}
-}
+}

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -212,6 +212,7 @@ import com.jeeplus.modules.worksendmessage.service.WorkSendMessageService;
 import com.jeeplus.modules.worksinglewage.entity.WorkSingleWage;
 import com.jeeplus.modules.worksinglewage.service.WorkSingleWageService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
 import com.jeeplus.modules.workstock.entity.WorkStock;
 import com.jeeplus.modules.workstock.service.WorkStockService;
@@ -1877,6 +1878,10 @@ public class WorkProjectNotifyController extends BaseController {
 					ProjectReportData projectReportData = projectReportDataService.getOnRural(workProjectNotify.getNotifyId());
 //					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectReportData.getProject().getId());
 					RuralProjectRecords ruralProjectRecords=ruralProjectRecordsService.getQueryProjectUsers(projectReportData.getProject().getId());
+					if(StringUtils.isBlank(ruralProjectRecords.getProjectMasterId())){
+						ruralProjectRecords.setProjectMasterId(projectReportData.getPrincipal().getId());
+						ruralProjectRecords.setProjectMasterName(projectReportData.getPrincipal().getName());
+					}
 					Act act = getByAct(projectReportData.getProcessInstanceId());
 					projectReportData.setAct(act);
 					Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
@@ -1895,9 +1900,17 @@ public class WorkProjectNotifyController extends BaseController {
 					//根据项目id查找咨询员信息
 					List<RuralReportConsultant> consultants=ruralProjectMessageService.getConsultantsList(projectReportData.getProject().getId());
 					for (RuralReportConsultant consultant:consultants){
+						//根据用户查询技能信息
+						List<WorkStaffCertificate> certificateList = ruralProjectMessageService.getCertificateByUser(consultant.getZixunyuan());
+						for (WorkStaffCertificate certificateInfo: certificateList) {
+							if(certificateInfo.getName().equals(consultant.getZhucezigezhKey())){
+								consultant.setZhucezigezhID(certificateInfo.getNum());
+							}
+						}
 						User user=userService.get(consultant.getZixunyuan());
 						consultant.setZixunyuanName(user.getName());
 					}
+
 					//根据条件查询附件必填项
 					//判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
 					/*Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
@@ -1920,7 +1933,7 @@ public class WorkProjectNotifyController extends BaseController {
 //					approvalMoney = 2;
 					String money=ruralProjectRecords.getSubmitMoney();
 					Integer approvalMoney=null;
-					if(null==money){
+					if(StringUtils.isBlank(money)){
 						approvalMoney=1;
 					}else{
 						approvalMoney=Integer.parseInt(money);
@@ -2159,7 +2172,7 @@ public class WorkProjectNotifyController extends BaseController {
 //							approvalMoney = 2;
 							String money=ruralProjectRecords.getSubmitMoney();
 							Integer approvalMoney=null;
-							if(null==money){
+							if(StringUtils.isBlank(money)){
 								approvalMoney=1;
 							}else{
 								approvalMoney=Integer.parseInt(money);
@@ -3776,7 +3789,7 @@ public class WorkProjectNotifyController extends BaseController {
 //						approvalMoney = 2;
 						String money=ruralProjectRecords.getSubmitMoney();
 						Integer approvalMoney=null;
-						if(null==money){
+						if(StringUtils.isBlank(money)){
 							approvalMoney=1;
 						}else{
 							approvalMoney=Integer.parseInt(money);

src/main/resources/mappings/modules/projectcontentinfo/ProjectcontentinfoDao.xml

@@ -555,7 +555,7 @@
 			#{updateDate},
 			#{delFlag},
 			#{zixunyuan},
-			#{zhucezigezhID},
+			#{zhucezigezhKey},
 			#{major},
 			#{wordnr},
 			#{projectId}
@@ -593,10 +593,16 @@
 			resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant">
 		select id
 			 ,zixunyuan
-			 ,zhucezigezhID
+			 ,zhucezigezhID as 'zhucezigezhKey'
 			 ,major
 			 ,wordnr
 			 ,projectId
 		from rural_report_consultant where projectId=#{projectId}
 	</select>
-</mapper>
+
+	<select id="getCertificateByUser" resultType="com.jeeplus.modules.workstaff.entity.WorkStaffCertificate">
+		select a.name,a.num from work_staff_certificate a
+		left join work_staff_achives wsa on a.staff_id = wsa.id
+		where wsa.user_id = #{userId} and a.del_flag=0
+	</select>
+</mapper>

src/main/webapp/WEB-INF/tags/sys/reportedtreeselectUser.tag

@@ -26,7 +26,7 @@
 	<div class="input-group">
 		<input id="${id}Name" name="${labelName}" placeholder="请选择${title}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="background-color: #ffffff; ${cssStyle} "/>
-       		
+
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
 <script type="text/javascript">
@@ -35,9 +35,9 @@
 		if ($("#${id}Button").hasClass("disabled")){
 			return true;
 		}
-		// 正常打开	
+		// 正常打开
 		top.layer.open({
-		    type: 2, 
+		    type: 2,
 		    area: ['300px', '420px'],
 		    title:"选择${title}",
 		    ajaxData:{selectIds: $("#${id}Id").val()},
@@ -101,6 +101,7 @@
 							success:function(data){
 								console.log(data)
 								$("#"+str+"zhucezigezhID").val(data.num);
+								$("#"+str+"zhucezigezhKey").val(data.name);
 								$("#"+str+"major").val(data.major);
 
 								// if(data.success) {
@@ -115,7 +116,7 @@
     	cancel: function(index){ //或者使用btn2
     	           //按钮【按钮二】的回调
     	       }
-		}); 
-	
+		});
+
 	});
-</script>
+</script>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -543,9 +543,9 @@
 			$(obj).parent().parent().remove();
 		}
 		function addRow(list, idx, tpl, row){
-			var idx1 = $("#reportedConsultantList tr").length;
-			idx1 +=1;
-			bornTemplete(list, idx1, tpl, row, idx);
+			/*var idx1 = $("#reportedConsultantList tr").length;
+			idx1 +=1;*/
+			bornTemplete(list, idx+1, tpl, row, idx);
 		}
 
 		function bornTemplete(list, idx, tpl, row, idx1){
@@ -581,9 +581,9 @@
 		<input type="hidden" id="projectSort" value="${projectSort}">
 		<input type="hidden" id="projectOnRuralId" name="projectOnRural.id" value="${projectRecords.id}">
 		<sys:message content="${message}"/>
-		<div class="form-group layui-row first lw12">
+		<%--<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>基本信息</h2></div>
-			<%--<div class="layui-item layui-col-sm6">
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>报告编号：</label>
 				<div class="layui-input-block">
 					<div class="input-group">
@@ -598,7 +598,7 @@
 							 </span>
 					</div>
 				</div>
-			</div>--%>
+			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
 				<div class="layui-input-block">
@@ -607,35 +607,7 @@
 					</form:select>
 				</div>
 			</div>
-			<c:choose>
-				<c:when test="${not empty projectcontentinfo.projectReportData.bzshbUserId}">
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
-						<div class="layui-input-block">
-							<select class="form-control required editable-select layui-input" id="bzshbUserId" disabled="disabled" name="projectReportData.bzshbUserId">
-								<option value="请选择审核人员"/>
-								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
-									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
-								</c:forEach>
-							</select>
-						</div>
-					</div>
-				</c:when>
-				<c:otherwise>
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
-						<div class="layui-input-block">
-							<select class="form-control required editable-select layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
-								<option value="请选择审核人员"/>
-								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
-									<option value="${user.id}">${user.name}</option>
-								</c:forEach>
-							</select>
-						</div>
-					</div>
-				</c:otherwise>
-			</c:choose>
-			<%--<div class="layui-item layui-col-sm6">
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 				<div class="layui-input-block">
 					<form:select path="projectReportData.reportType" class="form-control simple-select required">
@@ -644,8 +616,8 @@
 						<form:option value="实体章" label="实体章"/>
 					</form:select>
 				</div>
-			</div>--%>
-		</div>
+			</div>
+		</div>--%>
 
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目信息</h2></div>
@@ -871,6 +843,34 @@
 							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
+					<c:choose>
+						<c:when test="${not empty projectcontentinfo.projectReportData.bzshbUserId}">
+							<div class="layui-item layui-col-sm6 lw7">
+								<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
+								<div class="layui-input-block">
+									<select class="form-control required editable-select layui-input" id="bzshbUserId" disabled="disabled" name="projectReportData.bzshbUserId">
+										<option value="请选择审核人员"/>
+										<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
+											<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
+										</c:forEach>
+									</select>
+								</div>
+							</div>
+						</c:when>
+						<c:otherwise>
+							<div class="layui-item layui-col-sm6 lw7">
+								<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
+								<div class="layui-input-block">
+									<select class="form-control required editable-select layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+										<option value=""/>
+										<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
+											<option value="${user.id}">${user.name}</option>
+										</c:forEach>
+									</select>
+								</div>
+							</div>
+						</c:otherwise>
+					</c:choose>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">
@@ -964,7 +964,7 @@
 				<div class="layui-item layui-col-sm6 lw7" style="margin-top: 15px;">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${ruralProjectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
+						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
 													cssStyle="background-color:#fff" title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 <%--						<sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"--%>
 <%--									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
@@ -1018,7 +1018,7 @@
 							</tr>
 							</thead>
 							<tbody id="reportedConsultantList">
-								<c:forEach items="${info}" var = "info" varStatus="status">
+								<%--<c:forEach items="${info}" var = "info" varStatus="status">
 									<tr>
 										<td width="60px">
 											<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
@@ -1042,7 +1042,7 @@
 											<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
 										</td>
 									</tr>
-								</c:forEach>
+								</c:forEach>--%>
 							</tbody>
 						</table>
 						<script type="text/template" id="workClientBankTpl">//<!--
@@ -1051,6 +1051,7 @@
                                         <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
                                         <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                    	<input id="reportedConsultantList{{idx}}_zhucezigezhKey" name="reportedConsultantList[{{idx}}].zhucezigezhKey" type="hidden" value="{{row.zhucezigezhKey}}"/>
                                     </td>
 
                                     <td width="60px">
@@ -1565,7 +1566,7 @@
 	var workClientBankRowIdx = 0,
 			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
 	$(document).ready(function () {
-		var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
+		var dataBank = ${fns:toJson(info)};
 		for (var i = 0; i < dataBank.length; i++) {
 			addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
 			workClientBankRowIdx = workClientBankRowIdx + 1;

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportModify.jsp

@@ -270,7 +270,7 @@
                 multipartUploadWithSts(storeAs, file, attachmentId, attachmentFlag, uploadPath, divId, "0");
             }
         }
-        
+
         function selectNum() {
 			top.layer.open({
 				type: 2,
@@ -526,7 +526,7 @@
 			<input type="hidden" name="saveAuditFlag" value="1">
 			<input type="hidden" id="projectOnRuralId" name="projectOnRural.id" value="${projectRecords.id}">
 		<sys:message content="${message}"/>
-		<div class="form-group layui-row first lw12">
+		<%--<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>基本信息</h2></div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
@@ -537,7 +537,7 @@
 					</form:select>
 				</div>
 			</div>
-			<%--<div class="layui-item layui-col-sm6">
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 				<div class="layui-input-block">
 					<form:select path="projectReportData.reportType" class="form-control simple-select required">
@@ -546,8 +546,8 @@
 						<form:option value="实体章" label="实体章"/>
 					</form:select>
 				</div>
-			</div>--%>
-		</div>
+			</div>
+		</div>--%>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -1796,4 +1796,4 @@
 
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp

@@ -140,7 +140,7 @@
 			<input type="hidden" id="type" value="${type}">
 
 			<sys:message content="${message}"/>
-			<div class="form-group layui-row first lw12">
+			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
@@ -148,13 +148,13 @@
 						<form:input path="projectReportData.achievementType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">签章类型：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
-				</div>--%>
-			</div>
+				</div>
+			</div>--%>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw8">
@@ -438,7 +438,7 @@
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>咨询质量控制信息</h2></div>
 
-				<c:if test="${type ==3}">
+				<c:if test="${type ==3 || type ==4}">
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label">专业咨询员：</label>
 						<div class="layui-input-block  with-icon">
@@ -477,7 +477,7 @@
 						<div class="layui-input-block">
 							<div class="layui-item layui-col-sm6 lw7 with-textarea">
 								<div class="layui-input-block" style="margin-left:0px;position: relative">
-									<form:textarea placeholder="请输入审批意见:" path="projectReportData.technicistRemarks" id="technicistRemarks" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+									<form:textarea placeholder="请输入审批意见:" path="projectReportData.technicistRemarks" id="technicistRemarks" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="255" />
 									<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 									<input type="file" name="upload_files" style="display: none;">
 								</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -309,9 +309,9 @@
             $("#attachment_file").click();
         }
         function addRow(list, idx, tpl, row){
-            var idx1 = $("#reportedConsultantList tr").length;
-            idx1 +=1;
-            bornTemplete(list, idx1, tpl, row, idx);
+            /*var idx1 = $("#reportedConsultantList tr").length;
+            idx1 +=1;*/
+            bornTemplete(list, idx+1, tpl, row, idx);
         }
 
         function bornTemplete(list, idx, tpl, row, idx1){
@@ -374,7 +374,7 @@
 
 
             <sys:message content="${message}"/>
-            <div class="form-group layui-row first lw12">
+            <%--<div class="form-group layui-row first lw12">
                 <div class="form-group-label"><h2>基本信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
@@ -382,13 +382,13 @@
                         <form:input path="projectReportData.achievementType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
-                <%--<div class="layui-item layui-col-sm6">
+                <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label">签章类型：</label>
                     <div class="layui-input-block">
                         <form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
                     </div>
-                </div>--%>
-            </div>
+                </div>
+            </div>--%>
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>项目信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw8">
@@ -758,7 +758,7 @@
                             </tr>
                             </thead>
                             <tbody id="reportedConsultantList">
-                            <c:forEach items="${consultantinfo}" var = "info" varStatus="status">
+                            <%--<c:forEach items="${consultantinfo}" var = "info" varStatus="status">
                                 <tr>
                                     <td width="60px">
                                         <input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
@@ -781,7 +781,7 @@
                                         <span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
                                     </td>
                                 </tr>
-                            </c:forEach>
+                            </c:forEach>--%>
                             </tbody>
                         </table>
                         <script type="text/template" id="workClientBankTpl">//<!--
@@ -790,6 +790,7 @@
                                         <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
                                         <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhKey" name="reportedConsultantList[{{idx}}].zhucezigezhKey" type="hidden" value="{{row.zhucezigezhKey}}"/>
                                     </td>
 
                                     <td width="60px">
@@ -1241,7 +1242,7 @@
     var workClientBankRowIdx = 0,
         workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
     $(document).ready(function () {
-        var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
+        var dataBank = ${fns:toJson(consultantinfo)};
         for (var i = 0; i < dataBank.length; i++) {
             addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
             workClientBankRowIdx = workClientBankRowIdx + 1;
@@ -1404,4 +1405,4 @@
     }
 </script>
 </body>
-</html>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageView.jsp

@@ -42,7 +42,7 @@
 <div class="single-form">
 	<div class="container${container}  view-form">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal">
-			<div class="form-group layui-row first lw12">
+			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
@@ -50,13 +50,13 @@
 						<form:input path="projectReportData.achievementType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<%--<div class="layui-item layui-col-sm6">
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">签章类型：</label>
 					<div class="layui-input-block">
 						<form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</div>
-				</div>--%>
-			</div>
+				</div>
+			</div>--%>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -377,6 +377,55 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
+				<div class="form-group-label"><h2><span class="require-item">*</span>咨询员</h2></div>
+				<div class="layui-item layui-col-sm12 lw6">
+					<div class="layui-item nav-btns">
+						<table id="bankinfo" class="table table-bordered table-condensed can-edit">
+							<thead>
+							<tr>
+								<th width="60px">编号</th>
+								<th >咨询员名称</th>
+								<th >注册/资格证号</th>
+								<th >专业</th>
+								<th >本人负责内容</th>
+									<%--								<th width="100px">操作</th>--%>
+							</tr>
+							</thead>
+							<tbody id="reportedConsultantList">
+							<c:forEach items="${consultantinfo}" var = "info" varStatus="status">
+								<tr>
+									<td width="60px">
+										<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_zixunyuan" readonly="true" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuanName}" class="form-control required"/>
+
+											<%--										<sys:reportedtreeselectUser id="reportedConsultantList${status.index+1}_zixunyuan" name="reportedConsultantList[${status.index+1}].zixunyuan" value="${info.zixunyuan}" labelName="workAccountList[${status.index+1}].zixunyuan" labelValue="${info.zixunyuanName}"--%>
+											<%--																	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
+									</td>
+
+									<td>
+										<input id="reportedConsultantList${status.index+1}_zhucezigezhID" readonly="true" name="reportedConsultantList[${status.index+1}].zhucezigezhID" value="${info.zhucezigezhID}" class="form-control required"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_major" readonly="true"  name="reportedConsultantList[${status.index+1}].major" value="${info.major}" class="form-control required"/>
+									</td>
+									<td>
+										<input id="reportedConsultantList${status.index+1}_wordnr" readonly="true" placeholder="请输入本人负责内容" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control required"/>
+									</td>
+
+										<%--									<td class="text-center op-td" width="10">--%>
+										<%--										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>--%>
+										<%--									</td>--%>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+
+			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>成果文件</h2></div>
 				<div id="addFile_attachment" style="display: none" class="upload-progress">
 					<span id="fileName_attachment" ></span>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -549,9 +549,9 @@
 		<form:hidden path="project.id"/>
 		<input type="hidden" id="projectOnRuralId" name="projectOnRural.id" value="${projectRecords.id}">
 		<sys:message content="${message}"/>
-		<div class="form-group layui-row first lw12">
+		<%--<div class="form-group layui-row first lw12">
 			<div class="form-group-label"><h2>基本信息</h2></div>
-			<%--<div class="layui-item layui-col-sm6">
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>报告编号：</label>
 				<div class="layui-input-block">
 					<div class="input-group">
@@ -566,7 +566,7 @@
 							 </span>
 					</div>
 				</div>
-			</div>--%>
+			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
 				<div class="layui-input-block">
@@ -575,35 +575,7 @@
 					</form:select>
 				</div>
 			</div>
-			<c:choose>
-				<c:when test="${not empty projectcontentinfo.projectReportData.bzshbUserId}">
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
-						<div class="layui-input-block">
-							<select class="form-control required layui-input" id="bzshbUserId" disabled="disabled" name="projectReportData.bzshbUserId">
-								<option value=""/>
-								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
-									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
-								</c:forEach>
-							</select>
-						</div>
-					</div>
-				</c:when>
-				<c:otherwise>
-					<div class="layui-item layui-col-sm6 lw7">
-						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
-						<div class="layui-input-block">
-							<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
-								<option value=""/>
-								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
-									<option value="${user.id}">${user.name}</option>
-								</c:forEach>
-							</select>
-						</div>
-					</div>
-				</c:otherwise>
-			</c:choose>
-			<%--<div class="layui-item layui-col-sm6">
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>签章类型：</label>
 				<div class="layui-input-block">
 					<form:select path="projectReportData.reportType" class="form-control simple-select required">
@@ -612,8 +584,8 @@
 						<form:option value="实体章" label="实体章"/>
 					</form:select>
 				</div>
-			</div>--%>
-		</div>
+			</div>
+		</div>--%>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目信息</h2></div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -838,6 +810,34 @@
 							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
 						</div>
 					</div>
+					<c:choose>
+						<c:when test="${not empty projectcontentinfo.projectReportData.bzshbUserId}">
+							<div class="layui-item layui-col-sm6 lw7">
+								<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
+								<div class="layui-input-block">
+									<select class="form-control required layui-input" id="bzshbUserId" disabled="disabled" name="projectReportData.bzshbUserId">
+										<option value=""/>
+										<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
+											<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
+										</c:forEach>
+									</select>
+								</div>
+							</div>
+						</c:when>
+						<c:otherwise>
+							<div class="layui-item layui-col-sm6 lw7">
+								<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
+								<div class="layui-input-block">
+									<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+										<option value=""/>
+										<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
+											<option value="${user.id}">${user.name}</option>
+										</c:forEach>
+									</select>
+								</div>
+							</div>
+						</c:otherwise>
+					</c:choose>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">
@@ -983,7 +983,7 @@
 							</tr>
 							</thead>
 							<tbody id="reportedConsultantList">
-							<c:forEach items="${info}" var = "info" varStatus="status">
+							<%--<c:forEach items="${info}" var = "info" varStatus="status">
 								<tr>
 									<td width="60px">
 										<input id="reportedConsultantList${status.index+1}_costNum" name="reportedConsultantList[${status.index+1}].costNum" readonly="readonly" style="text-align: center"  value="${status.index+1}" type="text" class="form-control contentDetail"/>
@@ -1006,8 +1006,11 @@
 									<td class="text-center op-td" width="10">
 										<span class="op-btn op-btn-delete" onclick="delRow(this, '#reportedConsultantList${status.index+1}')" title="删除"><i class="fa fa-trash"></i>&nbsp;删除</span>
 									</td>
+									<td class="hide">
+										<input id="reportedConsultantList${status.index+1}_zhucezigezhKey" name="reportedConsultantList[${status.index+1}].zhucezigezhKey" type="hidden" value="${info.zhucezigezhKey}"/>
+									</td>
 								</tr>
-							</c:forEach>
+							</c:forEach>--%>
 							</tbody>
 						</table>
 						<script type="text/template" id="workClientBankTpl">//<!--
@@ -1016,6 +1019,7 @@
                                         <input id="reportedConsultantList{{idx}}_id" name="reportedConsultantList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
                                         <input id="reportedConsultantList{{idx}}_delFlag" name="reportedConsultantList[{{idx}}].delFlag" type="hidden" value="0"/>
                                         <input id="reportedConsultantList{{idx}}_remindId" name="reportedConsultantList[{{idx}}].remindId" type="hidden" value="{{row.remindId}}"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhKey" name="reportedConsultantList[{{idx}}].zhucezigezhKey" type="hidden" value="{{row.zhucezigezhKey}}"/>
                                     </td>
 
                                     <td width="60px">
@@ -1824,9 +1828,8 @@
 		$(obj).parent().parent().remove();
 	}
 	function addRow(list, idx, tpl, row){
-		var idx1 = $("#reportedConsultantList tr").length;
-		idx1 +=1;
-		bornTemplete(list, idx1, tpl, row, idx);
+		//var idx1 = $("#reportedConsultantList tr").length;
+		bornTemplete(list, idx+1, tpl, row, idx);
 	}
 
 	function bornTemplete(list, idx, tpl, row, idx1){
@@ -1851,7 +1854,7 @@
 	var workClientBankRowIdx = 0,
 			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
 	$(document).ready(function () {
-		var dataBank = ${fns:toJson(ruralProjectRecordsReported.reportedConsultantList)};
+		var dataBank = ${fns:toJson(info)};
 		for (var i = 0; i < dataBank.length; i++) {
 			addRow('#reportedConsultantList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
 			workClientBankRowIdx = workClientBankRowIdx + 1;

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -42,7 +42,11 @@
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
-
+			var status = $("#status").val();
+			if(5 != status){
+				parent.layer.msg("报告未审批完成，无法下载!", {icon: 5});
+				return false;
+			}
 			if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
 				width = 'auto';
 				height = 'auto';
@@ -151,7 +155,8 @@
 	<c:if test="${projectReportData.id!=null}">
 	<div class="container${container}  view-form" style="margin-top: 40px;">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo"  method="post" class="form-horizontal">
-			<div class="form-group layui-row first lw12">
+			<input type="hidden" id="status" value="${projectReportData.status}">
+			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
@@ -159,13 +164,13 @@
 						<form:input path="projectReportData.achievementType" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="achievementType" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-					<%--<div class="layui-item layui-col-sm6">
+					<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label">签章类型：</label>
                         <div class="layui-input-block">
                             <form:input path="projectReportData.ReportType" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
                         </div>
-                    </div>--%>
-			</div>
+                    </div>
+			</div>--%>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label">
 					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
@@ -427,4 +432,4 @@
 	}
 </script>
 </body>
-</html>
+</html>