Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml
#	src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -63,6 +63,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String tempType;    //模板类型
 	private String bzshbUserId; //总审用户id
 	private String ZiXunShouRu;	//造价咨询营业收入（万元）
+	private String ziXunShou;	//造价咨询营业收入
 
 	public String getNumberPath() {
 		return numberPath;
@@ -790,4 +791,12 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setExaminScore(String examinScore) {
 		this.examinScore = examinScore;
 	}
+
+	public String getZiXunShou() {
+		return ziXunShou;
+	}
+
+	public void setZiXunShou(String ziXunShou) {
+		this.ziXunShou = ziXunShou;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/ProjectPaperFilingDao.java

@@ -11,4 +11,7 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 @MyBatisDao
 public interface ProjectPaperFilingDao extends CrudDao<ProjectPaperFiling> {
     void updateProcessIdAndStatus(ProjectPaperFiling paperFiling);
+    void updatefileNum(ProjectPaperFiling paperFiling);
+
+    ProjectPaperFiling findByProjectId(String projectId);
 }

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

@@ -106,7 +106,7 @@ public class ProjectPaperFilingService extends CrudService<ProjectPaperFilingDao
         Activity activity = new Activity();
         WorkProjectNotify workProjectNotify = UtilNotify
                 .saveNotify(paperFiling.getId(),
-                        null,
+                        paperFiling.getCreateBy(),
                         paperFiling.getCompanyId(),
                         title,
                         str,
@@ -116,7 +116,7 @@ public class ProjectPaperFilingService extends CrudService<ProjectPaperFilingDao
                         ""
                 );
         List<User> users = new ArrayList<>();
-        List<User> bggdglys = UserUtils.getByRoleActivityEnname("bggdgly",3,office.getId(),"10",paperFiling.getCreateBy());
+        List<User> bggdglys = UserUtils.getByRoleActivityEnname("xxgdydyhu",3,office.getId(),"10",paperFiling.getCreateBy());
         if (StringUtils.isNotBlank(workActivityMenu.getId())) {
             workProjectNotify.setNotifyRole("");
             workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
@@ -152,6 +152,7 @@ public class ProjectPaperFilingService extends CrudService<ProjectPaperFilingDao
             if (bggdglys==null||bggdglys.size()==0){
                 throw new Exception("流程审批人不能为空,请联系管理员！");
             }
+            variables.put("applyUserId", paperFiling.getCreateBy().getId());
             variables.put("bggdglyList", bggdglys);
             variables.put("bggdglycount",bggdglys.size());
             processType = "paperFiling";
@@ -575,5 +576,13 @@ public class ProjectPaperFilingService extends CrudService<ProjectPaperFilingDao
         int i=dao.update(paperFiling);
         return "保存审核意见成功！";
     }
+    @Transactional(readOnly = false)
+    public void update(ProjectPaperFiling paperFiling){
+        paperFiling.preUpdate();
+        dao.updatefileNum(paperFiling);
+    }
+    public ProjectPaperFiling findByProjectId(String projectId){
+        return dao.findByProjectId(projectId);
+    }
 
 }

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

@@ -325,5 +325,70 @@ public class ProjectPaperFilingController extends BaseController {
         }
         return  act;
     }
+    /**
+     * 查看，增加，编辑项目表单页面
+     */
+    @RequestMapping(value = "adminPaperFiling")
+    public String adminPaperFiling(ProjectPaperFiling paperFiling, Model model) {
+        String view = paperFiling.getView();
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        projectRecords=ruralProjectRecordsService.get(paperFiling.getProjectId());
+        paperFiling=service.get(paperFiling.getId());
+        if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
+            ruralProjectRecordsService.queryProjectDetail(projectRecords);
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
+            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+            projectPlanInfo.setProjectId(projectRecords.getId());
+            //获取项目计划信息
+            List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+            //项目计划附件信息
+            List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
+            projectRecords.setProjectPlanList(projectPlanList);
+            projectRecords.setWorkAttachments(projectPlanAttachment);
+            projectRecords.setUploadMode(uploadMode);
+            if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+                //处理项目类别
+                List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+                for (MainDictDetail info: mainDictList) {
+                    if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+                        projectRecords.setAttachmentProjectSort(info.getLabel());
+                        break;
+                    }
+                }
+            }
 
+            //查询项目报告信息
+            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+            //如果项目报告不为空，则查询项目线上归档信息
+            if(null != projectReportData){
+                ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+                if(null != projectReportRecord){
+                    model.addAttribute("projectId", projectRecords.getId());
+                }else{
+                    model.addAttribute("projectId", "");
+                }
+            }
+        }
+        //查询所有的工程类型
+        List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+        model.addAttribute("engineeringInfo",engineeringInfos);
+        model.addAttribute("projectRecords", projectRecords);
+        paperFiling.setView(view);
+        model.addAttribute("projectPaperFiling", paperFiling);
+        return "modules/projectPaperFiling/projectPaperFilingAdmingModify";
+    }
+    @RequestMapping(value = "update")
+    public String update(ProjectPaperFiling paperFiling, Model model) {
+        service.update(paperFiling);
+        if (StringUtils.isNotBlank(paperFiling.getView()) && paperFiling.getView().equals("filing")){
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";
+        }else if (StringUtils.isNotBlank(paperFiling.getView()) && paperFiling.getView().equals("allfiling")){
+            return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessageAll/?repage";
+        }
+        return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralCostProjectMessage/?repage";
+    }
 }

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

@@ -27,6 +27,8 @@ import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.UserService;
 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 jersey.repackaged.com.google.common.collect.Lists;
 import org.activiti.engine.HistoryService;
@@ -128,7 +130,23 @@ public class RuralProjectMessageAllController extends BaseController {
             if(null != projectRecords.getWorkContractInfo().getClient()){
                 model.addAttribute("workContractInfoClientName", projectRecords.getWorkContractInfo().getClient().getName());
             }
-        }if(StringUtils.isNotBlank(oldSubmitMoney)){
+        }
+        //无合同状态下，获取委托方的名称
+        List<RuralProjectRecords> list = page.getList();
+        for (int i = 0; i < list.size(); i++) {
+            RuralProjectRecords records1 = list.get(i);
+            if (records1.getWorkContractInfo() == null) {
+                projectRecordsService.queryLinkmanInfos(records1);
+                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+                    WorkContractInfo contractInfo = new WorkContractInfo();
+                    contractInfo.setClient(linkman.getClientId());
+                    records1.setWorkContractInfo(contractInfo);
+                    records1.getWorkContractInfo().setClientName(records1.getWorkContractInfo().getClient().getName());
+                }
+            }
+        }
+        if(StringUtils.isNotBlank(oldSubmitMoney)){
             projectRecords.setSubmitMoney(oldSubmitMoney);
         }
         model.addAttribute("beginDate", projectRecords.getBeginDate());

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

@@ -177,6 +177,21 @@ public class RuralProjectMessageController extends BaseController {
                 model.addAttribute("workContractInfoClientName", projectRecords.getWorkContractInfo().getClient().getName());
             }
         }
+        //无合同状态下，获取委托方的名称
+        List<RuralProjectRecords> list = page.getList();
+        for (int i = 0; i < list.size(); i++) {
+            RuralProjectRecords records1 = list.get(i);
+            if (records1.getWorkContractInfo() == null) {
+                projectRecordsService.queryLinkmanInfos(records1);
+                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+                    WorkContractInfo contractInfo = new WorkContractInfo();
+                    contractInfo.setClient(linkman.getClientId());
+                    records1.setWorkContractInfo(contractInfo);
+                    records1.getWorkContractInfo().setClientName(records1.getWorkContractInfo().getClient().getName());
+                }
+            }
+        }
         if(StringUtils.isNotBlank(oldSubmitMoney)){
             projectRecords.setSubmitMoney(oldSubmitMoney);
         }

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

@@ -24,6 +24,7 @@ import com.jeeplus.modules.projectcontentinfo.service.*;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
 import com.jeeplus.modules.ruralprojectrecords.entity.*;
+import com.jeeplus.modules.ruralprojectrecords.service.ProjectPaperFilingService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.service.SubProjectInfoService;
@@ -96,6 +97,8 @@ public class RuralProjectViewController extends BaseController {
     @Autowired
     private RuralProjectRecordsService ruralProjectRecordsService;
     @Autowired
+    private ProjectPaperFilingService projectPaperFilingService;
+    @Autowired
     private SubProjectInfoService subProjectInfoService;
     @Autowired
     private ProjectReportRecordService projectReportRecordService;
@@ -1037,5 +1040,55 @@ public class RuralProjectViewController extends BaseController {
         model.addAttribute("bzshbUserName",user.getName());
         return "modules/ruralprojectrecords/view/reportIssueView";
     }
+    @RequestMapping(value = "paperView")
+    public String paperView(String projectId, Model model) {
+        RuralProjectRecords projectRecords=new RuralProjectRecords();
+        projectRecords=ruralProjectRecordsService.get(projectId);
+        ProjectPaperFiling paperFiling=projectPaperFilingService.findByProjectId(projectId);
+        if (projectRecords!=null&& StringUtils.isNotBlank(projectRecords.getId())) {
+            ruralProjectRecordsService.queryProjectDetail(projectRecords);
+            if(null != projectRecords.getWorkContractInfo()){
+                if(null != projectRecords.getWorkContractInfo().getContractTypeDoc()){
+                    projectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(projectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
+                }
+            }
+            ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+            projectPlanInfo.setProjectId(projectRecords.getId());
+            //获取项目计划信息
+            List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+            //项目计划附件信息
+            List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(projectRecords.getId());
+            projectRecords.setProjectPlanList(projectPlanList);
+            projectRecords.setWorkAttachments(projectPlanAttachment);
+            projectRecords.setUploadMode(uploadMode);
+            if(StringUtils.isNotBlank(projectRecords.getAttachmentProjectSort())){
+                //处理项目类别
+                List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+                for (MainDictDetail info: mainDictList) {
+                    if(projectRecords.getAttachmentProjectSort().equals(info.getValue())){
+                        projectRecords.setAttachmentProjectSort(info.getLabel());
+                        break;
+                    }
+                }
+            }
 
+            //查询项目报告信息
+            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
+            //如果项目报告不为空，则查询项目线上归档信息
+            if(null != projectReportData){
+                ProjectReportRecord projectReportRecord = ruralProjectMessageService.getProjectReportRecord(projectReportData.getId());
+                if(null != projectReportRecord){
+                    model.addAttribute("projectId", projectRecords.getId());
+                }else{
+                    model.addAttribute("projectId", "");
+                }
+            }
+        }
+        //查询所有的工程类型
+        List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+        model.addAttribute("engineeringInfo",engineeringInfos);
+        model.addAttribute("projectRecords", projectRecords);
+        model.addAttribute("projectPaperFiling", paperFiling);
+        return "modules/ruralprojectrecords/view/projectPaperFilingView";
+    }
 }

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

@@ -1140,7 +1140,6 @@ public class WorkFullManageController extends BaseController {
 				}
 			}
 		}
-
 		//约定作业期处理
 		String promiseTime = "";
 		if(null!= ruralProjectRecords.getStartDate() && null != ruralProjectRecords.getEndingDate()){
@@ -1280,6 +1279,19 @@ public class WorkFullManageController extends BaseController {
 			data.put("technicistMonth","");
 			data.put("technicistDay","");
 		}
+		//获取报告发起时间
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy年 MM月 dd日");
+		Date ziDate=projectReportData.getCreateDate();
+		String str = sdf.format(ziDate);
+		data.put("ziDate",str);
+		//报告状态
+		String dataStatus=projectReportData.getStatus();
+		if (dataStatus.equals("5")){
+			String ss = sdf.format(projectReportData.getAuditPassDate());
+			data.put("shenDate",ss);
+		}else{
+			data.put("shenDate","    年   月   日");
+		}
 		return data;
 	}
 

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

@@ -1552,6 +1552,7 @@ public class WorkProjectNotifyController extends BaseController {
 					}
 
 				} else if (workProjectNotify.getType().equals("110")) {    //项目纸质归档
+					String engineeringId = engineeringService.getEngineeringId("202");
 					boolean flag = false;
 					//通过通知信息id获取项目登记对象
 					ProjectPaperFiling projectPaperFiling = projectPaperFilingService.get(workProjectNotify.getNotifyId());
@@ -1581,20 +1582,110 @@ public class WorkProjectNotifyController extends BaseController {
 							ruralProjectRecords.getWorkContractInfo().setContractType(DictUtils.getMainDictLabel(String.valueOf(ruralProjectRecords.getWorkContractInfo().getContractTypeDoc()),"contract_info_type",""));
 						}
 					}
+					//获取项目基础信息
+					ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+					//工程咨询
+					List<MainDictDetail> mainDictList = Lists.newArrayList();
+					if("1".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort");
+						//造价审核
+					} else if("2".equals(ruralProjectRecords.getProjectType())){
+						mainDictList = DictUtils.getMainDictList("attachment_project_sort_cost");
+					}
+					if(StringUtils.isNotBlank(ruralProjectRecords.getAttachmentProjectSort())){
+						//处理项目类别
+						for (MainDictDetail info: mainDictList) {
+							if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
+								ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
+								break;
+							}
+						}
+					}
 					//查询所有的工程类型
 					List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
 					model.addAttribute("engineeringInfo",engineeringInfos);
 					model.addAttribute("processInstanceId", projectPaperFiling.getProcessInstanceId());
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					model.addAttribute("projectPaperFiling", projectPaperFiling);
-					//处理项目类别
-					List<MainDictDetail> mainDictList = DictUtils.getMainDictList("attachment_project_sort");
-					for (MainDictDetail info: mainDictList) {
-						if(ruralProjectRecords.getAttachmentProjectSort().equals(info.getValue())){
-							ruralProjectRecords.setAttachmentProjectSort(info.getLabel());
-							break;
+
+					//tap页
+					//查询所有的工程类型
+					List<ProjectEngineeringInfo> projectEngineeringInfo=engineeringService.findList(new ProjectEngineeringInfo());
+					model.addAttribute("projectEngineeringInfo",projectEngineeringInfo);
+					//项目计划
+					RuralProjectRecords projectRecordPlans = this.planView(ruralProjectRecords.getId());
+					model.addAttribute("projectRecordPlans", projectRecordPlans);
+					//获取子项目列表信息
+					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(ruralProjectRecords.getId());
+					model.addAttribute("subProjectInfos", subProjectInfos);
+					//线上归档
+					ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(ruralProjectRecords.getId());
+					ProjectReportRecord projectReportRecord = projectReportRecordService.getprojectReportRecord(projectReportData.getId());
+					if (null==projectReportRecord){
+						projectReportRecord=new ProjectReportRecord();
+					}
+					projectReportRecord.setProjectReportData(projectReportData);
+					projectReportRecord.setReport(projectReportData);
+					projectReportData.setZiXunShou(projectReportData.getZiXunShouRu());
+					Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
+					projectcontentinfo.setProjectReportData(projectReportData);
+					//获取合同信息
+					WorkContractInfo workContractInfo=this.queryWorkContract(ruralProjectRecords.getId());
+					if(null != workContractInfo){
+						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						model.addAttribute("workClientInfo", clientInfo);
+						if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
+							//收费标准
+							String [] biao=workContractInfo.getChargeCriterion().split(",");
+							List<String> chargeCriterionList=new ArrayList<>();
+							for (int i=0;i<biao.length;i++){
+								chargeCriterionList.add(biao[i]);
+							}
+							projectReportRecord.setChargeCriterionList(chargeCriterionList);
+						}
+					}
+					WorkContractInfo projectContractInfo = ruralProjectMessageService.getProjectContractInfo(ruralProjectRecords.getWorkContractInfo().getId());
+					ruralProjectRecords.setWorkContractInfo(projectContractInfo);
+					MyBeanUtils.copyBeanNotNull2Bean(ruralProjectRecords,projectReportRecord.getReport().getProject());//将编辑表单中的非NULL值覆盖数据库记录中的值
+					if(null != projectContractInfo){
+						if(projectContractInfo.getWorkClientInfoList().size()>0){
+							model.addAttribute("workClientInfoName", projectContractInfo.getWorkClientInfoList().get(0).getName());
 						}
 					}
+					RuralProjectcontentinfo ruralProjectcontentinfo = ruralProjectRecordsService.formAccessory(ruralProjectRecords);
+					ruralProjectRecordsService.disposeData(ruralProjectcontentinfo);
+					model.addAttribute("projectcontentinfo", ruralProjectcontentinfo);
+					model.addAttribute("projectReportData", projectReportData);
+					model.addAttribute("workContractInfo", workContractInfo);
+					model.addAttribute("projectReportRecord", projectReportRecord);
+					//获取质量复核项目组成员
+					List<RuralReportConsultant> consultantinfo =this.qualityView(ruralProjectRecords,projectReportData);
+					model.addAttribute("consultantinfo", consultantinfo);
+					//获取总审人员
+					User user=UserUtils.get(projectReportData.getBzshbUserId());
+					model.addAttribute("bzshbUserName",user.getName());
+					//质量复核标准展示
+					String review="";
+					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
+						review="1";
+					};
+					List<WorkReviewAudit> workReviewAuditList = projectContentDataService.findListReview(review,"质量复核");
+					WorkReviewAudit revAudit = new WorkReviewAudit();
+					String type = "4";
+					revAudit.setCompanyId(UserUtils.getSelectCompany().getId());
+					revAudit.setType(type);
+					revAudit.setReportId(projectReportData.getId());
+					List<WorkReviewAudit> reaudits = workReviewStandardService.findAuditList(revAudit);
+					for(WorkReviewAudit reAudit:workReviewAuditList){
+						for (WorkReviewAudit audit:reaudits){
+							if (reAudit.getId().equals(audit.getStandardId())){
+								reAudit.setDeductOption(audit.getDeductOption());
+								break;
+							}
+						}
+					}
+					model.addAttribute("datalist", workReviewAuditList);
+					
 					//查询总审人员信息
 					List<User> auditUserList = userService.getAuditUserList();
 					ruralProjectRecords.setBzshbUserList(auditUserList);

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -107,6 +107,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
     private String tryOutJob;   //试用岗位
     private String trialPeriod;   //试用期（月）
 	private String individualResume;   //个人简介
+	private String highestEducation;	//最高学历
 
 	//劳动关系临时属性
 	private String relationshipStatus;
@@ -232,7 +233,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 		super(id);
 	}
 
-	@ExcelField(title="部门", fieldType=Office.class, value="office.name", align=2, sort=1)
+	@ExcelField(title="部门", fieldType=Office.class, value="office.name", align=2, sort=6)
 	public Office getOffice() {
 		return office;
 	}
@@ -248,7 +249,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	public void setCompany(Office company) {
 		this.company = company;
 	}
-	
+
 	@ExcelField(title="工    号", align=2, sort=2)
 	public String getNo() {
 		return no;
@@ -808,4 +809,12 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	public void setIndividualResume(String individualResume) {
 		this.individualResume = individualResume;
 	}
+
+	public String getHighestEducation() {
+		return highestEducation;
+	}
+
+	public void setHighestEducation(String highestEducation) {
+		this.highestEducation = highestEducation;
+	}
 }

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfoExcel.java

@@ -0,0 +1,144 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.workstaff.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.common.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.modules.sys.entity.Area;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.workjobgrade.entity.WorkJobGrade;
+import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 员工基本信息 导出Entity
+ * @author ssrh
+ * @version 2018-07-26
+ */
+public class WorkStaffBasicInfoExcel extends DataEntity<WorkStaffBasicInfoExcel> {
+	private String name;		// 姓    名
+	private String idCard;		// 身份证号码
+	private String age;		// 年    龄
+	private String gender;		// 性    别
+	private String mobile;		// 移动电话
+	private String officeName;		// 部门名称
+	private Date entryDate;		// 入职日期
+	private String status;		// 员工状态
+	private String highestEducation;	//最高学历
+	private String certificateName; //执业资格证书
+	private String certificateNum; //执业资格证书编号
+	private Date certificateDate; //执业资格证书发证日期
+
+	@ExcelField(title="姓    名", align=2, sort=1)
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	@ExcelField(title="身份证号码", align=2, sort=2)
+	public String getIdCard() {
+		return idCard;
+	}
+
+	public void setIdCard(String idCard) {
+		this.idCard = idCard;
+	}
+
+	@ExcelField(title="年    龄", align=2, sort=3)
+	public String getAge() {
+		return age;
+	}
+
+	public void setAge(String age) {
+		this.age = age;
+	}
+
+	@ExcelField(title="性    别", align=2, sort=4)
+	public String getGender() {
+		return gender;
+	}
+
+	public void setGender(String gender) {
+		this.gender = gender;
+	}
+
+	@ExcelField(title="手机号", align=2, sort=5)
+	public String getMobile() {
+		return mobile;
+	}
+
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
+	}
+
+	@ExcelField(title="部    门", align=2, sort=6)
+	public String getOfficeName() {
+		return officeName;
+	}
+
+	public void setOfficeName(String officeName) {
+		this.officeName = officeName;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@ExcelField(title="入职日期", align=2, sort=7)
+	public Date getEntryDate() {
+		return entryDate;
+	}
+
+	public void setEntryDate(Date entryDate) {
+		this.entryDate = entryDate;
+	}
+
+	@ExcelField(title="员工状态", align=2, sort=8)
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	@ExcelField(title="最高学历", align=2, sort=9)
+	public String getHighestEducation() {
+		return highestEducation;
+	}
+
+	public void setHighestEducation(String highestEducation) {
+		this.highestEducation = highestEducation;
+	}
+
+	@ExcelField(title="执业资格证书", align=2, sort=10)
+	public String getCertificateName() {
+		return certificateName;
+	}
+
+	public void setCertificateName(String certificateName) {
+		this.certificateName = certificateName;
+	}
+
+	@ExcelField(title="证书编号", align=2, sort=11)
+	public String getCertificateNum() {
+		return certificateNum;
+	}
+
+	public void setCertificateNum(String certificateNum) {
+		this.certificateNum = certificateNum;
+	}
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@ExcelField(title="发证日期", align=2, sort=12)
+	public Date getCertificateDate() {
+		return certificateDate;
+	}
+
+	public void setCertificateDate(Date certificateDate) {
+		this.certificateDate = certificateDate;
+	}
+}

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -22,10 +22,7 @@ import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.AreaDao;
 import com.jeeplus.modules.sys.dao.UserDao;
-import com.jeeplus.modules.sys.entity.Area;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.Role;
-import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.service.*;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -987,5 +984,51 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         return workStaffAchivesDao.getJob(userId);
     }
 
-
+    public List<WorkStaffBasicInfoExcel> getExcelData(Page<WorkStaffBasicInfo> page){
+        List<WorkStaffBasicInfoExcel> excels=new ArrayList<>();
+        for (WorkStaffBasicInfo info:page.getList()){
+            info = this.getByAchiveId(info);
+            WorkStaffCertificate entity = new WorkStaffCertificate();
+            entity.setStaffId(info.getAchiveId());
+            info.setCertificateList(certificateService.findList(entity));
+            WorkStaffBasicInfoExcel infoExcel=new WorkStaffBasicInfoExcel();
+            infoExcel.setName(info.getName());
+            infoExcel.setIdCard(info.getIdCard());
+            Integer age=info.getAge();
+            if (null!=age){
+                infoExcel.setAge(age.toString());
+            }else{
+                infoExcel.setAge("");
+            }
+            if (info.getGender().equals("1")){
+                infoExcel.setGender("男");
+            }else{
+                infoExcel.setGender("女");
+            }
+            infoExcel.setMobile(info.getMobile());
+            infoExcel.setOfficeName(info.getOffice().getName());
+            infoExcel.setEntryDate(info.getEntryDate());
+            infoExcel.setStatus(info.getStatus());
+            infoExcel.setHighestEducation(info.getHighestEducation());
+            if (info.getCertificateList().size()>0){
+                WorkStaffCertificate certificate=info.getCertificateList().get(0);
+                infoExcel.setCertificateName(certificate.getName());
+                List<MainDictDetail> certificateType = DictUtils.getMainDictList("certificate_type");
+                for (MainDictDetail type : certificateType) {
+                    if(certificate.getName().equals(type.getValue())){
+                        infoExcel.setCertificateName(type.getLabel());
+                        break;
+                    }
+                }
+                infoExcel.setCertificateNum(certificate.getNum());
+                infoExcel.setCertificateDate(certificate.getIssuingDate());
+            }else{
+                infoExcel.setCertificateName("");
+                infoExcel.setCertificateNum("");
+                infoExcel.setCertificateDate(null);
+            }
+            excels.add(infoExcel);
+        }
+        return excels;
+    }
 }

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -32,6 +32,7 @@ import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfoExcel;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificateImport;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
@@ -123,6 +124,10 @@ public class WorkStaffBasicInfoController extends BaseController {
 		}
 		Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response), workStaffBasicInfo);
 		List<WorkStaffBasicInfo> list = page.getList();
+		for (WorkStaffBasicInfo info:list){
+			info.setRoleId(roleService.getRoleIdByUserId(info.getUserId()));
+			info.setRoleName(roleService.get(info.getRoleId()).getName());
+		}
 		model.addAttribute("page", page);
 		return "modules/workstaff/workStaffBasicInfoList";
 	}
@@ -435,7 +440,8 @@ public class WorkStaffBasicInfoController extends BaseController {
 		try {
             String fileName = "员工信息"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
             Page<WorkStaffBasicInfo> page = workStaffBasicInfoService.findPage(new Page<WorkStaffBasicInfo>(request, response, -1), workStaffBasicInfo);
-    		new ExportExcel(true,"员工信息", WorkStaffBasicInfo.class,1).setDataList(page.getList()).write(response, fileName).dispose();
+			List<WorkStaffBasicInfoExcel> excelData=workStaffBasicInfoService.getExcelData(page);
+            new ExportExcel("员工信息", WorkStaffBasicInfoExcel.class).setDataList(excelData).write(response, fileName).dispose();
             addMessage(redirectAttributes, "导出员工信息记录成功！");
     		return null;
 		} catch (Exception e) {

src/main/resources/freemarker/batchFilingList.ftl

@@ -2,14 +2,14 @@
 <?mso-application progid="Excel.Sheet"?>
 <Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882">
 	<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-		<Author>Admin</Author>
-		<LastAuthor>enford</LastAuthor>
-		<Created>2021-07-28T01:37:00Z</Created>
-		<LastSaved>2021-07-28T02:13:27Z</LastSaved>
+		<Author>DM</Author>
+		<LastAuthor>大猫～</LastAuthor>
+		<Created>2021-07-30T07:25:58Z</Created>
+		<LastSaved>2021-07-30T07:27:32Z</LastSaved>
 	</DocumentProperties>
 	<CustomDocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+		<ICV dt:dt="string">62B06D7C6F9F41468A9E16D37DF016D0</ICV>
 		<KSOProductBuildVer dt:dt="string">2052-11.1.0.10667</KSOProductBuildVer>
-		<ICV dt:dt="string">25F8FAA23C8546179E6DFC1480405460</ICV>
 	</CustomDocumentProperties>
 	<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
 		<WindowWidth>23040</WindowWidth>
@@ -20,177 +20,69 @@
 	<Styles>
 		<Style ss:ID="Default" ss:Name="Normal">
 			<Alignment ss:Vertical="Center"/>
-			<Borders/>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
-			<Interior/>
-			<NumberFormat/>
-			<Protection/>
+											<Borders/>
+													 <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000"/>
+																															<Interior/>
+																																	  <NumberFormat/>
+																																					<Protection/>
 		</Style>
 		<Style ss:ID="s49"/>
 		<Style ss:ID="s50">
 			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
 		</Style>
 		<Style ss:ID="s51">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#DDDDDD"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333" ss:Bold="1"/>
-			<Interior ss:Color="#F5F5F6" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s52">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#DDDDDD"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333" ss:Bold="1"/>
-			<Interior ss:Color="#F5F5F6" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s53">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#DDDDDD"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333" ss:Bold="1"/>
-			<Interior ss:Color="#F5F5F6" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s54">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7EAEC"/>
-			</Borders>
-			<Font ss:FontName="Helvetica" x:CharSet="134" ss:Size="10.5" ss:Color="#333333"/>
-			<Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s55">
 			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7EAEC"/>
-			</Borders>
-			<Font ss:FontName="Helvetica" x:CharSet="134" ss:Size="10.5" ss:Color="#333333"/>
-			<Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
+																   <Font ss:FontName="宋体" x:CharSet="134" ss:Size="11" ss:Color="#000000" ss:Bold="1"/>
+																																					  <Interior ss:Color="#D0CECE" ss:Pattern="Solid"/>
 		</Style>
-		<Style ss:ID="s56">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7EAEC"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333"/>
-			<Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s57">
-			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
-			<Borders>
-				<Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#EBEBEB"/>
-				<Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7E7E7"/>
-				<Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2" ss:Color="#E7EAEC"/>
-			</Borders>
-			<Font ss:FontName="宋体" x:CharSet="134" ss:Size="10.5" ss:Color="#333333"/>
-			<Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
-		</Style>
-		<Style ss:ID="s58">
+		<Style ss:ID="s52">
 			<Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
 		</Style>
 	</Styles>
 	<Worksheet ss:Name="Sheet1">
-		<Table ss:ExpandedColumnCount="5" ss:ExpandedRowCount="6" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="48.6" ss:DefaultRowHeight="14.4">
-			<Column ss:Index="1" ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="116.8"/>
-			<Column ss:Index="2" ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="126.25"/>
-			<Column ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="292.3"/>
-			<Column ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="314.55"/>
-			<Column ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="113.4"/>
-			<Row ss:Height="15.15">
-				<Cell ss:StyleID="s58" ss:MergeAcross="4">
-					<Data ss:Type="String">${filingBatch}+${batchName}+${batchUser}</Data>
+		<Table ss:ExpandedColumnCount="5" ss:ExpandedRowCount="5" x:FullColumns="1" x:FullRows="1" ss:DefaultColumnWidth="48" ss:DefaultRowHeight="14.4">
+			<Column ss:Index="1" ss:StyleID="Default" ss:AutoFitWidth="0" ss:Width="90" ss:Span="4"/>
+			<Row>
+				<Cell ss:StyleID="s52" ss:MergeAcross="4">
+					<Data ss:Type="String">批次号+归档名称+归档人</Data>
 				</Cell>
 			</Row>
-			<Row ss:Height="15.15">
+			<Row>
 				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">项目编号</Data>
 				</Cell>
-				<Cell ss:StyleID="s52">
+				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">报告号</Data>
 				</Cell>
-				<Cell ss:StyleID="s52">
+				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">项目名称</Data>
 				</Cell>
-				<Cell ss:StyleID="s53">
+				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">归档文件类型</Data>
 				</Cell>
-				<Cell ss:StyleID="s53">
+				<Cell ss:StyleID="s51">
 					<Data ss:Type="String">归档文件描述</Data>
 				</Cell>
 			</Row>
 			<#list list as list>
-				<Row ss:Height="15.15">
-					<Cell ss:StyleID="s54">
+				<Row>
+					<Cell>
 						<Data ss:Type="String">${list.projectId}</Data>
 					</Cell>
-					<Cell ss:StyleID="s55">
+					<Cell>
 						<Data ss:Type="String">${list.number}</Data>
 					</Cell>
-					<Cell ss:StyleID="s55">
+					<Cell>
 						<Data ss:Type="String">${list.projectName}</Data>
 					</Cell>
-					<Cell ss:StyleID="s56">
+					<Cell>
 						<Data ss:Type="String">${list.batchFileType}</Data>
 					</Cell>
-					<Cell ss:StyleID="s56">
+					<Cell>
 						<Data ss:Type="String">${list.batchFileMiao}</Data>
 					</Cell>
 				</Row>
 			</#list>
-				<Cell ss:StyleID="s57">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Color="#333333"/>
-						<Font html:Color="#333333">苏兴审核</Font>
-						<Font html:Face="Helvetica" html:Color="#333333">-2021-0154</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:StyleID="s56">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Color="#333333"/>
-						<Font html:Color="#333333">苏兴造字【</Font>
-						<Font html:Face="Helvetica" html:Color="#333333">2021</Font>
-						<Font html:Color="#333333">】</Font>
-						<Font html:Face="Helvetica" html:Color="#333333">1551</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:StyleID="s55">
-					<ss:Data ss:Type="String" xmlns="http://www.w3.org/TR/REC-html40">
-						<Font html:Color="#333333"/>
-						<Font html:Color="#333333">2020</Font>
-						<Font html:Face="宋体" html:Color="#333333">年南京江宁</Font>
-						<Font html:Color="#333333">10kv</Font>
-						<Font html:Face="宋体" html:Color="#333333">及以下</Font>
-					</ss:Data>
-				</Cell>
-				<Cell ss:StyleID="s56">
-					<Data ss:Type="String">报告</Data>
-				</Cell>
-				<Cell ss:StyleID="s56">
-					<Data ss:Type="String">报告正文</Data>
-				</Cell>
-			</Row>
 		</Table>
 		<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
 			<PageSetup>
@@ -204,9 +96,9 @@
 			<Panes>
 				<Pane>
 					<Number>3</Number>
-					<ActiveRow>8</ActiveRow>
-					<ActiveCol>2</ActiveCol>
-					<RangeSelection>R9C3</RangeSelection>
+					<ActiveRow>5</ActiveRow>
+					<ActiveCol>3</ActiveCol>
+					<RangeSelection>R6C4</RangeSelection>
 				</Pane>
 			</Panes>
 			<ProtectObjects>False</ProtectObjects>

src/main/resources/freemarker/massControl.ftl

@@ -1813,7 +1813,7 @@
 												<w:sz w:val="20"/>
 												<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 											</w:rPr>
-											<w:t>日期：  年   月   日</w:t>
+											<w:t>日期：${ziDate}</w:t>
 										</w:r>
 									</w:p>
 									<w:p>
@@ -2038,7 +2038,7 @@
 											<w:sz w:val="20"/>
 											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>日期：  年   月   日</w:t>
+										<w:t>日期：${ziDate}</w:t>
 									</w:r>
 								</w:p>
 								<w:p>
@@ -2261,7 +2261,7 @@
 											<w:sz w:val="20"/>
 											<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
 										</w:rPr>
-										<w:t>日期：  年   月   日</w:t>
+										<w:t>日期：${shenDate}</w:t>
 									</w:r>
 								</w:p>
 								<w:p>

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

@@ -65,6 +65,7 @@
 		SELECT
 			<include refid="projectReportDataColumns"/>
 			,a.bzshb_user_id as "bzshbUserId"
+			,a.audit_pass_date as "auditPassDate"
 			,c.name as "consultant.name"
 			,p.name as "principal.name"
 			,t.name as "technicist.name"

src/main/resources/mappings/modules/ruralprojectrecords/ProjectPaperFilingDao.xml

@@ -41,6 +41,13 @@
 		<include refid="projectPaperFilingJions"/>
 		WHERE a.id = #{id}
 	</select>
+	<select id="findByProjectId"
+			resultType="com.jeeplus.modules.ruralprojectrecords.entity.ProjectPaperFiling">
+		SELECT
+		<include refid="projectPaperFilingColumns"/>
+		FROM project_paper_filing a
+		WHERE a.project_id = #{projectId}
+	</select>
 	<insert id="insert">
 		INSERT INTO project_paper_filing(
 			id,
@@ -86,4 +93,12 @@
 			   process_instance_id = #{processInstanceId}
 		WHERE id = #{id}
 	</update>
+	<update id="updatefileNum">
+		UPDATE project_paper_filing SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			file_num = #{fileNum},
+			file_num_tow = #{fileNumTow}
+		WHERE id = #{id}
+	</update>
 </mapper>

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -237,6 +237,11 @@
 		,ifnull(pmdr.status,0) as "defectRecordStatus"
 		,pmdr.process_instance_id as "pmdrProcessInstanceId"
 		,pmdr.id as pmdrId
+		,ifnull(ppf.status,0) as "paperFilingStatus"
+		,ppf.process_instance_id as "ppfProcessInstanceId"
+		,ppf.id as "ppfId"
+		,pfb.process_instance_id AS "filingProcessinstanceId"
+		,ifnull(pfp.status,0) as "filingProjectStatus"
 		,ifnull(prd.approval_fee ,"") as "approvalFee"
 		,ifnull(prd.review_fee ,"") as "reviewFee"
 		,ifnull(prd.verify_fee ,"") as "verifyFee"
@@ -247,6 +252,7 @@
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
+		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
 		LEFT JOIN sys_user sua on a.create_by = sua.id
 		<if test="leaderNameStr !=null and leaderNameStr !=''">
 			LEFT JOIN work_project_user w on a.id = w.project_id
@@ -263,6 +269,7 @@
 		left join rural_project_report_record prr on prr.report_id = prd.id
 		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join project_paper_filing ppf on ppf.project_id = a.id
 		<where>
 			a.status = 5
 			<if test="bzshbUserId!=null and bzshbUserId!=''">
@@ -457,7 +464,6 @@
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
 		LEFT JOIN sys_user sua on a.create_by = sua.id
-
 		<where>
 			a.status = 5
 			<if test="bzshbUserId!=null and bzshbUserId!=''">

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -357,10 +357,13 @@
 		,ifnull(ppf.status,0) as "paperFilingStatus"
 		,ppf.process_instance_id as "ppfProcessInstanceId"
 		,ppf.id as "ppfId"
+		,pfb.process_instance_id AS "filingProcessinstanceId"
+		,ifnull(pfp.status,0) as "filingProjectStatus"
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
 		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
+		LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
 		LEFT JOIN sys_user sua on a.create_by = sua.id
         <if test="leaderNameStr !=null and leaderNameStr !=''">
             LEFT JOIN work_project_user w on a.id = w.project_id

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -57,7 +57,8 @@
 		a.qq_id AS "qqId",
 		a.try_out_job AS "tryOutJob",
 		a.trial_period AS "trialPeriod",
-		a.individual_resume AS "individualResume"
+		a.individual_resume AS "individualResume",
+		a.highest_education As "highestEducation"
 <!--		ur.role_id AS "roleId",-->
 <!--		r.name AS "roleName"-->
 	</sql>
@@ -350,7 +351,8 @@
 			qq_id,
 			try_out_job,
 			trial_period,
-			individual_resume
+			individual_resume,
+			highest_education
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -399,7 +401,8 @@
 			#{qqId},
 			#{tryOutJob},
 			#{trialPeriod},
-			#{individualResume}
+			#{individualResume},
+			#{highestEducation}
 		)
 	</insert>
 
@@ -448,7 +451,8 @@
 			qq_id = #{qqId},
 			try_out_job = #{tryOutJob},
 			trial_period = #{trialPeriod},
-			individual_resume = #{individualResume}
+			individual_resume = #{individualResume},
+			highest_education = #{highestEducation}
 		WHERE id = #{id}
 	</update>
 

src/main/webapp/webpage/modules/act/actTaskHistoricFlow.jsp

@@ -16,6 +16,15 @@
 		display: inline-block;
 	}
 </style>
+<script>
+	function readOpenInfo(value) {
+		layer.open({
+			title: '意见',
+			btn: ['关闭'],
+			content: value
+		});
+	}
+</script>
 <div class="layui-col-sm12 layui-col-md12 layui-col-lg12 workflow-table">
 	<table id="spLiu" class="table table-striped table-bordered table-hover table-condensed details">
 		<thead>
@@ -107,7 +116,7 @@
 							<span>流程结束</span>
 						</c:when>
 						<c:otherwise>
-							<span title="${act.comment }">${act.comment }</span>
+							<span title="${act.comment }" onclick="readOpenInfo('${act.comment}')">${act.comment }</span>
 						</c:otherwise>
 					</c:choose>
 

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingAdmingModify.jsp

@@ -0,0 +1,559 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目审批管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if(validateForm.form()){
+				var fileNum =  $("#fileNum").val();
+				var fileNumTow =  $("#fileNumTow").val();
+				if(fileNum == ''|| fileNum == undefined){
+					top.layer.msg('填写案卷号！', {icon: 0});
+					return;
+				}
+				if(fileNumTow == ''|| fileNumTow == undefined){
+					top.layer.msg('请再次填写案卷号！', {icon: 0});
+					return;
+				}
+				if(fileNum != fileNumTow){
+					top.layer.msg('两次案卷号填写不同，请重新输入！', {icon: 0});
+					return;
+				}
+				$("#inputForm").attr("action","${ctx}/paperFiling/paperFiling/update");
+				$("#inputForm").submit();
+				return true;
+			}
+
+			return false;
+		}
+		$(document).ready(function() {
+			var radioVal ;
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			var tt = $("#contractNum").val();
+			if (tt == null || tt === "") {
+				$("#divv").hide();
+				$("#divv2").show();
+				$("#divv3").hide();
+				setTimeout(function () {
+					var tt = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).text().trim();
+					$("#clientName").val(tt);
+				},100);
+			}else{
+				$("#divv2").hide();
+			}
+
+			layui.use('form', function () {
+				var form = layui.form;
+				form.render();
+			});
+			//默认打开判断是否时紧急项目
+			<%--var submitMoney="${projectRecords.submitMoney}"--%>
+			<%--if(submitMoney==1){--%>
+			<%--	$("#emergencyProject").parent().parent().parent().show();--%>
+			<%--	var emergencyProject="${projectRecords.emergencyProject}"--%>
+			<%--	if (emergencyProject=="1"){--%>
+			<%--		$("#emergencyProject").prop("checked",true);--%>
+			<%--		layui.form.render();--%>
+			<%--	}else{--%>
+			<%--		$("#emergencyProject").prop("checked",false);--%>
+			<%--		layui.form.render();--%>
+			<%--	}--%>
+			<%--}--%>
+		});
+		function initRecordStatus(index,id,dataid,status)
+		{
+			var elem = document.getElementById("status_td_" + index);
+			var st = getAuditState(status);
+			if(st.action)
+				var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + id + "&projectReportData.id="+ dataid + "&type="+status+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+			else
+				var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+
+			elem.innerHTML = xml;
+		}
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="container view-form">
+		<form:form id="inputForm" modelAttribute="projectPaperFiling" action="${ctx}/paperFiling/paperFiling/update" method="post" class="form-horizontal  layui-form">
+			<input type="hidden" id="id" name="id" value="${projectPaperFiling.id}">
+			<input type="hidden" id="id" name="projectId" value="${projectRecords.id}">
+			<form:hidden path="view"/>
+			<div class="form-group layui-row first">
+				<div class="form-group-label"><h2>项目合同信息</h2></div>
+               <div id="divv">
+				   <div class="layui-item layui-col-sm12 lw6">
+					   <label class="layui-form-label">合同编号：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
+					   </div>
+				   </div>
+				   <div class="layui-item layui-col-sm6 lw6">
+					   <label class="layui-form-label">合同名称：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+					   </div>
+				   </div>
+					<c:if test="${projectRecords.workContractInfo.contractInformation =='0'}">
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label double-line">合同金额(元)：</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
+							</div>
+						</div>
+					</c:if>
+				   <c:if test="${projectRecords.workContractInfo.contractInformation =='1'}">
+					   <div class="layui-item layui-col-sm6 lw6">
+						   <label class="layui-form-label">费率合同：</label>
+						   <div class="layui-input-block">
+							   <input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" title="${projectRecords.workContractInfo.otherDetails}" value="${projectRecords.workContractInfo.otherDetails}"/>
+						   </div>
+					   </div>
+				   </c:if>
+
+
+				   <div class="layui-item layui-col-sm6 lw6">
+					   <label class="layui-form-label">委托方：</label>
+					   <div class="layui-input-block">
+						   <input htmlEscape="false" style="background-color: #f1f1f1"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+					   </div>
+				   </div>
+			   </div>
+				<div id="divv2">
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">无合同</label>
+					</div>
+				</div>
+				<div id="divv3">
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">合同类型：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
+						</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">
+					<label class="layui-form-label">项目名称：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目编号：</label>
+					<div class="layui-input-block">
+						<div class="input-group">
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectId}"/>
+							<span class="input-group-btn">
+                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
+                             </span>
+						</div>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目所在地：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">投资性质：</label>
+					<div class="layui-input-block">
+						<c:if test="${projectRecords.projectProperties==null}">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+						</c:if>
+						<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+							<c:if test="${v.value==projectRecords.projectProperties}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+							</c:if>
+						</c:forEach>
+					</div>
+				</div>
+					<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--					<label class="layui-form-label">所在省份：</label>--%>
+					<%--					<div class="layui-input-block">--%>
+					<%--						<form:input path="province" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
+					<%--					</div>--%>
+					<%--				</div>--%>
+					<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--					<label class="layui-form-label">所在地级市：</label>--%>
+					<%--					<div class="layui-input-block">--%>
+					<%--						<form:input path="city" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
+					<%--					</div>--%>
+					<%--				</div>--%>
+					<%--				<div class="layui-item layui-col-sm6 lw6">--%>
+					<%--					<label class="layui-form-label">所在区县：</label>--%>
+					<%--					<div class="layui-input-block">--%>
+					<%--						<form:input path="county" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
+					<%--					</div>--%>
+					<%--				</div>--%>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">建设地点：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目责任人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">所属部门：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目负责人：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.projectMasterName}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">工程类型：</label>
+					<div class="layui-input-block">
+						<c:forEach items="${engineeringInfo}" var="e">
+							<c:if test="${e.id==projectRecords.engineeringType}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${e.engineeringName}"/>
+							</c:if>
+						</c:forEach>
+<%--						<form:select path="" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">--%>
+<%--							<form:options items="${engineeringInfo}" itemLabel="engineeringName" itemValue="id" htmlEscape="false"/>--%>
+<%--							&lt;%&ndash;							<c:forEach items="${engineeringInfo}" varStatus="index" var="info">&ndash;%&gt;--%>
+<%--							&lt;%&ndash;								<form:option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</form:option>&ndash;%&gt;--%>
+<%--							&lt;%&ndash;							</c:forEach>&ndash;%&gt;--%>
+<%--						</form:select>--%>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">项目等级：</label>
+					<div class="layui-input-block">
+						<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
+							<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+						</c:forEach>
+							<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+                                <form:option value=""/>
+                                <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>--%>
+					</div>
+				</div>
+<%--				<div class="layui-item layui-col-sm6 lw7" style="display: none">--%>
+<%--					<label class="layui-form-label double-line">是否是紧急项目：</label>--%>
+<%--					<div class="layui-input-block">--%>
+<%--						<div style="margin-right: 30px;">--%>
+<%--							<input type="checkbox" id="emergencyProject" disabled lay-filter="emergencyProject" lay-skin="switch" lay-text="是|否">--%>
+<%--						</div>--%>
+<%--					</div>--%>
+<%--				</div>--%>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line">送审规模（万元）：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.submitScale}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line">工作开始日期：</label>
+					<div class="layui-input-block">
+						<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label double-line">工作结束日期：</label>
+					<div class="layui-input-block">
+						<input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label">创建日期：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label">项目类别：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6 with-textarea">
+					<label class="layui-form-label">工程概况：</label>
+					<div class="layui-input-block">
+						<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw6 with-textarea">
+					<label class="layui-form-label">备注：</label>
+					<div class="layui-input-block">
+						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>提交说明</h2></div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" id="fileNum" name="fileNum"  class="form-control layui-input" value="${projectPaperFiling.fileNum}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 lw7">
+					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
+					<div class="layui-input-block">
+						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum" value="${projectPaperFiling.fileNumTow}"/>
+					</div>
+				</div>
+			</div>
+
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>委托方联系人信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th class="hide"></th>
+							<th width="25%">委托方</th>
+							<th width="25%">联系人姓名</th>
+							<th width="25%">联系方式1</th>
+							<th width="25%">联系方式2</th>
+						</tr>
+						</thead>
+						<tbody id="workClientLinkmanList">
+							<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+								<tr>
+									<td >
+											${info.clientId.name}
+									</td>
+									<td>
+											${info.name}
+									</td>
+									<td>
+											${info.linkPhone}
+									</td>
+									<td>
+											${info.linkMobile}
+									</td>
+								</tr>
+							</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>施工方信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="contentTable1" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th class="hide"></th>
+							<th width="25%">施工方单位名称</th>
+							<th width="25%">联系人姓名</th>
+							<th width="25%">联系方式1</th>
+							<th width="25%">联系方式2</th>
+						</tr>
+						</thead>
+						<tbody id="workConstructionLinkmanList">
+							<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+								<tr>
+									<td >
+											${info.clientId.name}
+									</td>
+									<td>
+											${info.name}
+									</td>
+									<td>
+											${info.linkPhone}
+									</td>
+									<td>
+											${info.linkMobile}
+									</td>
+								</tr>
+							</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目报告</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="upTable" class="table table-bordered table-condensed details">
+						<thead>
+						<tr>
+							<th width="25%">报告编号</th>
+							<th width="25%">报告名称</th>
+							<th width="25%">创建日期</th>
+							<th width="25%">状态</th>
+						</tr>
+						</thead>
+						<tbody>
+						<c:choose>
+							<c:when test="${not empty projectRecords.projectReportData}">
+								<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+									<tr>
+										<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}','95%', '95%')">
+												${projectReportData.number}
+										</a></td>
+										<td>
+												${projectReportData.name}
+										</td>
+										<td>
+											<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+										</td>
+										<td class="op-td">
+											<div style="text-align: center" id="status_td_${index.index+1}">
+											</div>
+											<script>
+												initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+											</script>
+										</td>
+									</tr>
+								</c:forEach>
+							</c:when>
+							<c:otherwise>
+								<tr>
+									<td colspan="7">
+										暂无数据
+									</td>
+								</tr>
+							</c:otherwise>
+						</c:choose>
+						</tbody>
+					</table>
+				</div>
+			</div>
+
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
+						<thead>
+						<tr>
+							<th width="25%">文件预览</th>
+							<th width="25%">上传人</th>
+							<th width="25%">上传时间</th>
+							<th width="25%">操作</th>
+						</tr>
+						</thead>
+						<tbody id="file_attachment">
+						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
+							<tr>
+								<c:choose>
+									<c:when test="${projectRecords.uploadMode == 2}">
+										<c:choose>
+											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+														<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+															</c:when>
+															<c:otherwise>
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+									</c:when>
+									<c:otherwise>
+										<c:choose>
+											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+														<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+															</c:when>
+															<c:otherwise>
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+									</c:otherwise>
+								</c:choose>
+
+
+								<td>${workClientAttachment.createBy.name}</td>
+								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+								<td  class="op-td">
+									<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+									<c:if test="${workClientAttachment.collectFlag != 1}">
+										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+									</c:if>
+<!--									<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>-->
+								</td>
+							</tr>
+						</c:forEach>
+						</tbody>
+					</table>
+				</div>
+			</div>
+			<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -704,46 +704,60 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '电子',  width:70,templet:function(d){
+                ,{align:'center', title: '电子',  width:120,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-                        else
-                            var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						var de = getdefectRecordState(""+d.defectRecordStatus);
+						if(st.action){
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
+						} else{
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}
+						if (d.defectRecordStatus>0){
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+						}
                         return xml;
                     }}
-				,{align:'center', title: '资料缺失',  width:90,templet:function(d){
-						var st = getdefectRecordState(""+d.defectRecordStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
-							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						return xml;
-					}}
-				,{align:'center', title: '批量',  width:70,templet:function(d){
-						var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
+				<%--,{align:'center', title: '资料缺失',  width:90,templet:function(d){--%>
+				<%--		var st = getdefectRecordState(""+d.defectRecordStatus);--%>
+				<%--		if(st.action)--%>
+				<%--			var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		else--%>
+				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		return xml;--%>
+				<%--	}}--%>
+				,{align:'center', title: '线下',  width:70,templet:function(d){
+						if (d.submitMoney=="1"){
+							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
+						}else if (d.submitMoney=="2"){
+							var st = getRuralProjectArchiveState(d.paperFilingStatus);
+						}
+						if(st.action){
+							if (d.submitMoney=="1"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}else if (d.submitMoney=="2"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}
+						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}
 						return xml;
 					}}
 				,{align:'center', title: '上报',  width:90,templet:function(d){
 						var st = getReportedState(d.reportedState);
 						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
-							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						return xml;
-					}}
-				,{align:'center', title: '纸质',  width:90,templet:function(d){
-						var st = getRuralProjectArchiveState(d.paperFilingStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.reportedProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
+				<%--,{align:'center', title: '纸质',  width:90,templet:function(d){--%>
+				<%--		var st = getRuralProjectArchiveState(d.paperFilingStatus);--%>
+				<%--		if(st.action)--%>
+				<%--			var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		else--%>
+				<%--			var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		return xml;--%>
+				<%--	}}--%>
                 ,{field:'op',align:'center',title:"操作",width:350,templet:function(d) {
 						////对操作进行初始化
 						var xml = '<div class=\"layui-btn-group\">';
@@ -1003,9 +1017,12 @@
 							}
 						}
 						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
-						if ('0'!=d.projectReportStatus){
+						if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralCostProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
 						}
+						if(d.paperFilingStatus == 5){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +" ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
+						}
 						if(d.projectReportStatus == 5){
 							if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";
@@ -1052,8 +1069,8 @@
 					,"view":"${projectRecords.view}"
 					,"reportStatus":"${projectRecords.reportStatus}"
 					,"syncStatus":"${projectRecords.syncStatus}"
-					,"downProjectReportRecordStatus":"${projectRecords.downProjectReportRecordStatus}"
-					,"prrdProcessInstanceId":"${projectRecords.prrdProcessInstanceId}"
+					,"downProjectReportRecordStatus":"${projectRecords.filingProjectStatus}"
+					,"prrdProcessInstanceId":"${projectRecords.filingProcessinstanceId}"
 					,"prrdId":"${projectRecords.prrdId}"
 					,"emergencyProject":"${projectRecords.emergencyProject}"
 					,"bid":"${projectRecords.prdId}"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -813,28 +813,42 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '电子',  width:90,templet:function(d){
+                ,{align:'center', title: '电子',  width:120,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-                        else
-                            var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-                        return xml;
-                    }}
-				,{align:'center', title: '资料缺失',  width:90,templet:function(d){
-						var st = getdefectRecordState(""+d.defectRecordStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
+                        if(st.action){
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}
+						var de = getdefectRecordState(""+d.defectRecordStatus);
+						if (d.defectRecordStatus>0){
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+						}
 						return xml;
-					}}
-				,{align:'center', title: '批量',  width:70,templet:function(d){
-						var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
+                    }}
+				<%--,{align:'center', title: '资料缺失',  width:90,templet:function(d){--%>
+				<%--		var st = getdefectRecordState(""+d.defectRecordStatus);--%>
+				<%--		if(st.action)--%>
+				<%--			var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		else--%>
+				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		return xml;--%>
+				<%--	}}--%>
+				,{align:'center', title: '线下',  width:70,templet:function(d){
+						if (d.submitMoney=="1"){
+							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
+						}else if (d.submitMoney=="2"){
+							var st = getRuralProjectArchiveState(d.paperFilingStatus);
+						}
+						if(st.action){
+							if (d.submitMoney=="1"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}else if (d.submitMoney=="2"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}
+						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}
 						return xml;
 					}}
 				,{align:'center', title: '上报',  width:90,templet:function(d){
@@ -881,9 +895,12 @@
 						</shiro:hasPermission>
 
 						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
-							if ('0'!=d.projectReportStatus){
+							if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus ){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改复核信息', '${ctx}/ruralProject/ruralProjectMessageAll/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改复核信息</a>";
 							}
+							if(d.paperFilingStatus == 5){
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +"&view=allfiling ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
+							}
 						</shiro:hasPermission>
 						xml+="</div>";
 						return[xml].join('');
@@ -920,8 +937,8 @@
 					,"view":"${projectRecords.view}"
 					,"reportStatus":"${projectRecords.reportStatus}"
 					,"syncStatus":"${projectRecords.syncStatus}"
-					,"downProjectReportRecordStatus":"${projectRecords.downProjectReportRecordStatus}"
-					,"prrdProcessInstanceId":"${projectRecords.prrdProcessInstanceId}"
+					,"downProjectReportRecordStatus":"${projectRecords.filingProjectStatus}"
+					,"prrdProcessInstanceId":"${projectRecords.filingProcessinstanceId}"
 					,"prrdId":"${projectRecords.prrdId}"
 					,"emergencyProject":"${projectRecords.emergencyProject}"
 					,"bid":"${projectRecords.prdId}"
@@ -935,6 +952,10 @@
 					,"newReportAuditNotifyFlag":"${projectRecords.newReportAuditNotifyFlag}"
 					,"newRecordAuditNotifyFlag":"${projectRecords.newRecordAuditNotifyFlag}"
 					,"reportNotifyId":"${projectRecords.reportNotifyId}"
+					,"paperFilingStatus":"${projectRecords.paperFilingStatus}"
+					,"ppfId":"${projectRecords.ppfId}"
+					,"ppfProcessInstanceId":"${projectRecords.ppfProcessInstanceId}"
+					,"submitMoney":"${projectRecords.submitMoney}"
 					,"falg":
 					<c:choose>
 						<c:when test="${fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id}">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -702,28 +702,42 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '电子',  width:70,templet:function(d){
+                ,{align:'center', title: '电子',  width:120,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-                        else
-                            var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						var de = getdefectRecordState(""+d.defectRecordStatus);
+						if(st.action){
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}else{
+							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}
+						if (d.defectRecordStatus>0){
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+						}
                         return xml;
                     }}
-				,{align:'center', title: '资料缺失',  width:90,templet:function(d){
-						var st = getdefectRecordState(""+d.defectRecordStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
+				<%--,{align:'center', title: '资料缺失',  width:90,templet:function(d){--%>
+				<%--		var st = getdefectRecordState(""+d.defectRecordStatus);--%>
+				<%--		if(st.action)--%>
+				<%--			var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		else--%>
+				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		return xml;--%>
+				<%--	}}--%>
+                ,{align:'center', title: '线下',  width:70,templet:function(d){
+						if (d.submitMoney=="1"){
+							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
+						}else if (d.submitMoney=="2"){
+							var st = getRuralProjectArchiveState(d.paperFilingStatus);
+						}
+                        if(st.action){
+                        	if (d.submitMoney=="1"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}else if (d.submitMoney=="2"){
+								var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportedProcess?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							}
+						}else{
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						return xml;
-					}}
-                ,{align:'center', title: '批量',  width:70,templet:function(d){
-                        var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrdProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-                        else
-                            var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+						}
                         return xml;
                     }}
                 ,{align:'center', title: '上报',  width:90,templet:function(d){
@@ -734,14 +748,14 @@
                             var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '纸质',  width:90,templet:function(d){
-						var st = getRuralProjectArchiveState(d.paperFilingStatus);
-						if(st.action)
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						else
-							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
-						return xml;
-					}}
+				<%--,{align:'center', title: '纸质',  width:90,templet:function(d){--%>
+				<%--		var st = getRuralProjectArchiveState(d.paperFilingStatus);--%>
+				<%--		if(st.action)--%>
+				<%--			var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.ppfProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		else--%>
+				<%--			var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
+				<%--		return xml;--%>
+				<%--	}}--%>
 				,{field:'op',align:'center',title:"操作",width:350,templet:function(d) {
 
 							////对操作进行初始化
@@ -1003,9 +1017,12 @@
 							}
 						}
 						<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:adminEdit">
-						if ('0'!=d.projectReportStatus){
+						if ('0'!=d.projectReportStatus && '1'!=d.projectReportStatus){
 							xml+="<a href=\"#\" onclick=\"openDialogre('修改质量复核', '${ctx}/ruralProject/ruralProjectMessage/adminEditForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改质量复核</a>";
 						}
+						if(d.paperFilingStatus == 5){
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改纸质归档案卷号', '${ctx}/paperFiling/paperFiling/adminPaperFiling?id=" + d.ppfId + "&projectId=" + d.id +"&view=filing ','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改纸质归档</a>";
+						}
 						if(d.projectReportStatus == 5){
 							if (d.projectReportStatusTwo != 5 && d.projectReportStatusTwo != 2){
 								xml+="<a href=\"#\" onclick=\"openDialogre('修改报告质量复核信息', '${ctx}/ruralProject/ruralProjectMessageNew/reviewForm?projectId=" + d.id +"&view=reloadReport&edit=reviewAgain','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 重新复核</a>";
@@ -1042,9 +1059,9 @@
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectReportStatus":"${projectRecords.projectReportStatus}"
                     ,"projectReportRecordStatus":"${projectRecords.projectReportRecordStatus}"
-                    ,"downProjectReportRecordStatus":"${projectRecords.downProjectReportRecordStatus}"
+                    ,"downProjectReportRecordStatus":"${projectRecords.filingProjectStatus}"
                     ,"prrProcessInstanceId":"${projectRecords.prrProcessInstanceId}"
-                    ,"prrdProcessInstanceId":"${projectRecords.prrdProcessInstanceId}"
+                    ,"prrdProcessInstanceId":"${projectRecords.filingProcessinstanceId}"
                     ,"reportedProcessInstanceId":"${projectRecords.reportedProcessInstanceId}"
                     ,"prrId":"${projectRecords.prrId}"
                     ,"prrdId":"${projectRecords.prrdId}"

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

@@ -73,7 +73,8 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
 		</ul>
 	</div>

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

@@ -0,0 +1,563 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>项目审批管理</title>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(i){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if(validateForm.form()){
+				var fileNum =  $("#fileNum").val();
+				var fileNumTow =  $("#fileNumTow").val();
+				if(fileNum == ''|| fileNum == undefined){
+					top.layer.msg('填写案卷号！', {icon: 0});
+					return;
+				}
+				if(fileNumTow == ''|| fileNumTow == undefined){
+					top.layer.msg('请再次填写案卷号！', {icon: 0});
+					return;
+				}
+				if(fileNum != fileNumTow){
+					top.layer.msg('两次案卷号填写不同，请重新输入！', {icon: 0});
+					return;
+				}
+				$("#inputForm").attr("action","${ctx}/paperFiling/paperFiling/update");
+				$("#inputForm").submit();
+				return true;
+			}
+
+			return false;
+		}
+		$(document).ready(function() {
+			var radioVal ;
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			var tt = $("#contractNum").val();
+			if (tt == null || tt === "") {
+				$("#divv").hide();
+				$("#divv2").show();
+				$("#divv3").hide();
+				setTimeout(function () {
+					var tt = $("#workClientLinkmanList").find("tr").eq(0).find("td").eq(1).text().trim();
+					$("#clientName").val(tt);
+				},100);
+			}else{
+				$("#divv2").hide();
+			}
+
+			layui.use('form', function () {
+				var form = layui.form;
+				form.render();
+			});
+			//默认打开判断是否时紧急项目
+			<%--var submitMoney="${projectRecords.submitMoney}"--%>
+			<%--if(submitMoney==1){--%>
+			<%--	$("#emergencyProject").parent().parent().parent().show();--%>
+			<%--	var emergencyProject="${projectRecords.emergencyProject}"--%>
+			<%--	if (emergencyProject=="1"){--%>
+			<%--		$("#emergencyProject").prop("checked",true);--%>
+			<%--		layui.form.render();--%>
+			<%--	}else{--%>
+			<%--		$("#emergencyProject").prop("checked",false);--%>
+			<%--		layui.form.render();--%>
+			<%--	}--%>
+			<%--}--%>
+		});
+		function initRecordStatus(index,id,dataid,status)
+		{
+			var elem = document.getElementById("status_td_" + index);
+			var st = getAuditState(status);
+			if(st.action)
+				var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + id + "&projectReportData.id="+ dataid + "&type="+status+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+			else
+				var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+
+			elem.innerHTML = xml;
+		}
+	</script>
+</head>
+<body>
+<div class="tapfixed">
+	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+		<ul class="list-tabs" >
+			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+			<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">质量复核信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
+		</ul>
+	</div>
+</div>
+<div class="single-form">
+	<c:if test="${null == projectPaperFiling.id}">
+		<div class="topMar">
+			<h2>暂无纸质归档信息</h2>
+		</div>
+	</c:if>
+	<c:if test="${null != projectPaperFiling.id}">
+	<div class="container view-form">
+		<form:form id="inputForm" modelAttribute="projectPaperFiling" action="${ctx}/paperFiling/paperFiling/update" method="post" class="form-horizontal  layui-form">
+
+
+				<div class="form-group layui-row first">
+					<div class="form-group-label"><h2>项目合同信息</h2></div>
+					<div id="divv">
+						<div class="layui-item layui-col-sm12 lw6">
+							<label class="layui-form-label">合同编号：</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">合同名称：</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+							</div>
+						</div>
+						<c:if test="${projectRecords.workContractInfo.contractInformation =='0'}">
+							<div class="layui-item layui-col-sm6 lw6">
+								<label class="layui-form-label double-line">合同金额(元)：</label>
+								<div class="layui-input-block">
+									<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
+								</div>
+							</div>
+						</c:if>
+						<c:if test="${projectRecords.workContractInfo.contractInformation =='1'}">
+							<div class="layui-item layui-col-sm6 lw6">
+								<label class="layui-form-label">费率合同：</label>
+								<div class="layui-input-block">
+									<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" title="${projectRecords.workContractInfo.otherDetails}" value="${projectRecords.workContractInfo.otherDetails}"/>
+								</div>
+							</div>
+						</c:if>
+
+
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">委托方：</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+							</div>
+						</div>
+					</div>
+					<div id="divv2">
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">无合同</label>
+						</div>
+					</div>
+					<div id="divv3">
+						<div class="layui-item layui-col-sm6 lw6">
+							<label class="layui-form-label">合同类型：</label>
+							<div class="layui-input-block">
+								<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
+							</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">
+						<label class="layui-form-label">项目名称：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">项目编号：</label>
+						<div class="layui-input-block">
+							<div class="input-group">
+								<input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectId}"/>
+								<span class="input-group-btn">
+                                <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
+                             </span>
+							</div>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">项目所在地：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.province}-${projectRecords.city}-${projectRecords.county}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">投资性质：</label>
+						<div class="layui-input-block">
+							<c:if test="${projectRecords.projectProperties==null}">
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input"/>
+							</c:if>
+							<c:forEach  items="${fns:getMainDictList('project_properties')}" var="v">
+								<c:if test="${v.value==projectRecords.projectProperties}">
+									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${v.label}"/>
+								</c:if>
+							</c:forEach>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">建设地点：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">创建人：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">项目责任人：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">所属部门：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">项目负责人：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.projectMasterName}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">工程类型：</label>
+						<div class="layui-input-block">
+							<c:forEach items="${engineeringInfo}" var="e">
+								<c:if test="${e.id==projectRecords.engineeringType}">
+									<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${e.engineeringName}"/>
+								</c:if>
+							</c:forEach>
+								<%--						<form:select path="" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">--%>
+								<%--							<form:options items="${engineeringInfo}" itemLabel="engineeringName" itemValue="id" htmlEscape="false"/>--%>
+								<%--							&lt;%&ndash;							<c:forEach items="${engineeringInfo}" varStatus="index" var="info">&ndash;%&gt;--%>
+								<%--							&lt;%&ndash;								<form:option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</form:option>&ndash;%&gt;--%>
+								<%--							&lt;%&ndash;							</c:forEach>&ndash;%&gt;--%>
+								<%--						</form:select>--%>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">项目等级：</label>
+						<div class="layui-input-block">
+							<c:forEach items="${fns:getMainDictListOnProjectAdvent('attachment_project_grade')}" var="v">
+								<input type="radio" disabled name="submitMoney" id="submitMoney" value="${v.value}" title="${v.label}" <c:if test="${projectRecords.submitMoney==v.value}">checked</c:if>>
+							</c:forEach>
+								<%--<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
+                                    <form:option value=""/>
+                                    <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                                </form:select>--%>
+						</div>
+					</div>
+						<%--				<div class="layui-item layui-col-sm6 lw7" style="display: none">--%>
+						<%--					<label class="layui-form-label double-line">是否是紧急项目：</label>--%>
+						<%--					<div class="layui-input-block">--%>
+						<%--						<div style="margin-right: 30px;">--%>
+						<%--							<input type="checkbox" id="emergencyProject" disabled lay-filter="emergencyProject" lay-skin="switch" lay-text="是|否">--%>
+						<%--						</div>--%>
+						<%--					</div>--%>
+						<%--				</div>--%>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label double-line">送审规模（万元）：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.submitScale}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label double-line">工作开始日期：</label>
+						<div class="layui-input-block">
+							<input class="laydate-icondate form-control layui-input layer-date ash"  style="background-color: #f1f1f1" readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${projectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label double-line">工作结束日期：</label>
+						<div class="layui-input-block">
+							<input class="laydate-icondate form-control layui-input layer-date "  style="background-color: #f1f1f1" readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${projectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6">
+						<label class="layui-form-label">创建日期：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label">项目类别：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6 with-textarea">
+						<label class="layui-form-label">工程概况：</label>
+						<div class="layui-input-block">
+							<textarea htmlEscape="false" rows="4" readonly="true"  style="background-color: #f1f1f1" maxlength="1000" class="form-control" >${projectRecords.projectDesc}</textarea>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw6 with-textarea">
+						<label class="layui-form-label">备注：</label>
+						<div class="layui-input-block">
+							<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000"  style="background-color: #f1f1f1" class="form-control" >${projectRecords.remarks}</textarea>
+						</div>
+					</div>
+				</div>
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>提交说明</h2></div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label">案卷号：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" id="fileNum" readonly="true" name="fileNum"  class="form-control layui-input" value="${projectPaperFiling.fileNum}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<label class="layui-form-label">确认案卷号：</label>
+						<div class="layui-input-block">
+							<input id="fileNumTow" name="fileNumTow" readonly="true" type="text"  class="layui-input form-control" equalTo="#fileNum" value="${projectPaperFiling.fileNumTow}"/>
+						</div>
+					</div>
+				</div>
+
+
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>委托方联系人信息</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+							<thead>
+							<tr>
+								<th class="hide"></th>
+								<th width="25%">委托方</th>
+								<th width="25%">联系人姓名</th>
+								<th width="25%">联系方式1</th>
+								<th width="25%">联系方式2</th>
+							</tr>
+							</thead>
+							<tbody id="workClientLinkmanList">
+							<c:forEach items="${projectRecords.workClientLinkmanList}" var="info" varStatus="index">
+								<tr>
+									<td >
+											${info.clientId.name}
+									</td>
+									<td>
+											${info.name}
+									</td>
+									<td>
+											${info.linkPhone}
+									</td>
+									<td>
+											${info.linkMobile}
+									</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+					</div>
+				</div>
+
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>施工方信息</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<table id="contentTable1" class="table table-bordered table-condensed no-bottom-margin details">
+							<thead>
+							<tr>
+								<th class="hide"></th>
+								<th width="25%">施工方单位名称</th>
+								<th width="25%">联系人姓名</th>
+								<th width="25%">联系方式1</th>
+								<th width="25%">联系方式2</th>
+							</tr>
+							</thead>
+							<tbody id="workConstructionLinkmanList">
+							<c:forEach items="${projectRecords.workConstructionLinkmanList}" var="info" varStatus="index">
+								<tr>
+									<td >
+											${info.clientId.name}
+									</td>
+									<td>
+											${info.name}
+									</td>
+									<td>
+											${info.linkPhone}
+									</td>
+									<td>
+											${info.linkMobile}
+									</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+					</div>
+				</div>
+
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>项目报告</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<table id="upTable" class="table table-bordered table-condensed details">
+							<thead>
+							<tr>
+								<th width="25%">报告编号</th>
+								<th width="25%">报告名称</th>
+								<th width="25%">创建日期</th>
+								<th width="25%">状态</th>
+							</tr>
+							</thead>
+							<tbody>
+							<c:choose>
+								<c:when test="${not empty projectRecords.projectReportData}">
+									<c:forEach items="${projectRecords.projectReportData}" var="projectReportData" varStatus="index">
+										<tr>
+											<td><a title="${projectReportData.number}" href="javascript:void(0)" onclick="openDialogView('查看报告详情', '${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}','95%', '95%')">
+													${projectReportData.number}
+											</a></td>
+											<td>
+													${projectReportData.name}
+											</td>
+											<td>
+												<fmt:formatDate value="${projectReportData.reportDate}" pattern="yyyy-MM-dd"/>
+											</td>
+											<td class="op-td">
+												<div style="text-align: center" id="status_td_${index.index+1}">
+												</div>
+												<script>
+													initRecordStatus(${index.index+1},"${id}","${projectReportData.id}","${projectReportData.status}");
+												</script>
+											</td>
+										</tr>
+									</c:forEach>
+								</c:when>
+								<c:otherwise>
+									<tr>
+										<td colspan="7">
+											暂无数据
+										</td>
+									</tr>
+								</c:otherwise>
+							</c:choose>
+							</tbody>
+						</table>
+					</div>
+				</div>
+
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>项目计划附件信息</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
+							<thead>
+							<tr>
+								<th width="25%">文件预览</th>
+								<th width="25%">上传人</th>
+								<th width="25%">上传时间</th>
+								<th width="25%">操作</th>
+							</tr>
+							</thead>
+							<tbody id="file_attachment">
+							<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
+								<tr>
+									<c:choose>
+										<c:when test="${projectRecords.uploadMode == 2}">
+											<c:choose>
+												<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+													<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+												</c:when>
+												<c:otherwise>
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:otherwise>
+											</c:choose>
+										</c:when>
+										<c:otherwise>
+											<c:choose>
+												<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+													<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+												</c:when>
+												<c:otherwise>
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+															<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:otherwise>
+											</c:choose>
+										</c:otherwise>
+									</c:choose>
+
+
+									<td>${workClientAttachment.createBy.name}</td>
+									<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+									<td  class="op-td">
+										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+										<c:if test="${workClientAttachment.collectFlag != 1}">
+											<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+										</c:if>
+										<!--									<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>-->
+									</td>
+								</tr>
+							</c:forEach>
+							</tbody>
+						</table>
+					</div>
+				</div>
+				<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+	</c:if>
+</div>
+</body>
+</html>

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

@@ -151,20 +151,9 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
-
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
         </ul>
-<%--        <ul class="list-tabs" >--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>--%>
-<%--            <c:if test="${reportedId!=null}">--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>--%>
-<%--            </c:if>--%>
-<%--            <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
-<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
-<%--        </ul>--%>
     </div>
     </div>
     <div class="container" style="margin-top: 50px;">

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

@@ -197,7 +197,8 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
 			</ul>
 		</div>

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

@@ -173,20 +173,10 @@
 				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
 			</ul>
-<%--			<ul class="list-tabs" >--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
-<%--				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}&projectId=${projectRecords.id}">报告信息</a></li>--%>
-<%--				<c:if test="${reportedId!=null}">--%>
-<%--					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${projectcontentinfo.id}">上报信息</a></li>--%>
-<%--				</c:if>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
-<%--			</ul>--%>
 		</div>
 	</div>
 <%--	</c:if>--%>

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

@@ -173,20 +173,10 @@
 				<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
 			</ul>
-<%--			<ul class="list-tabs" >--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>--%>
-<%--				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}&projectId=${projectRecords.id}">报告信息</a></li>--%>
-<%--				<c:if test="${reportedId!=null}">--%>
-<%--					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${projectcontentinfo.id}">上报信息</a></li>--%>
-<%--				</c:if>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>--%>
-<%--				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>--%>
-<%--			</ul>--%>
 		</div>
 	</div>
 <%--	</c:if>--%>

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

@@ -123,7 +123,8 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 
         </ul>
 <%--        <ul class="list-tabs" >--%>

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

@@ -81,8 +81,8 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
-
+<%--			<li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 		</ul>
 	</div>
 	</div>
@@ -140,6 +140,12 @@
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目基础信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw6">
+                    <label class="layui-form-label">报告号：</label>
+                    <div class="layui-input-block">
+                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${flagProjectReportData.number}"/>
+                    </div>
+                </div>
+				<div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目名称：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" style="background-color: #f1f1f1" value="${projectRecords.projectName}"/>

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

@@ -36,7 +36,8 @@
 			<li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+<%--			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
 		</ul>
 	</div>
 	</div>

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

@@ -30,7 +30,8 @@
             <li><a href="${ctx}/ruralProject/ruralProjectView/reportIssue?projectId=${projectRecords.id}">报告签发信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>
+<%--            <li><a href="${ctx}/ruralProject/ruralProjectView/searchview?id=${projectRecords.id}">选查信息详情</a></li>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/paperView?projectId=${projectRecords.id}">纸质归档信息</a></li>
         </ul>
     </div>
     </div>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -594,6 +594,12 @@
                         </select>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label"><span class="require-item">*</span>最高学历：</label>
+                    <div class="layui-input-block ">
+                        <form:input placeholder="请输入最高学历" path="highestEducation" htmlEscape="false" class="form-control layui-input required" maxlength="64"/>
+                    </div>
+                </div>
                 <div class="layui-item layui-col-sm12  lw7 with-textarea">
                     <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block">

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -250,8 +250,9 @@
                 ,{field:'idCard',align:'center', title: '身份证号码',minWidth:150}
                 ,{field:'mobile',align:'center', title: '移动电话', minWidth:100}
                 ,{field:'office',align:'center', title: '部门', minWidth:100}
-                // ,{field:'role',align:'center', title: '岗位', minWidth:100}
-                ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
+                ,{field:'role',align:'center', title: '岗位', minWidth:100}
+                ,{field:'highestEducation',align:'center', title: '最高学历', minWidth:100}
+                // ,{field:'jobGrade',align:'center', title: '职级', minWidth:100}
                 /*,{field:'auditUserName',align:'center', title: '校审人员', minWidth:100
                     ,event:'auditUserId',config:{type:'select',data:params,verify:true}
                     ,templet:function (d) {
@@ -287,7 +288,7 @@
                     ,"id":"${workStaffBasicInfo.id}"
                     ,"auditUserId":"${workStaffBasicInfo.auditUserId}"
                     ,"auditUserName":"${workStaffBasicInfo.auditUserName}"
-                    <%--,"role":"${workStaffBasicInfo.roleName}"--%>
+                    ,"role":"${workStaffBasicInfo.roleName}"
                     ,"no":"<c:out value="${workStaffBasicInfo.no}" escapeXml="true"/>"
                     ,"name":"<c:out value="${workStaffBasicInfo.name}" escapeXml="false"/>"
                     ,"idCard":"<c:out value="${workStaffBasicInfo.idCard}" escapeXml="true"/>"
@@ -295,6 +296,7 @@
                     ,'office':"<c:out value="${workStaffBasicInfo.office.name}" escapeXml="true"/>"
                     ,'jobGrade':"<c:out value="${workStaffBasicInfo.jobGrade.name}" escapeXml="true"/>"
                     ,'status':"<c:out value="${workStaffBasicInfo.status}" escapeXml="true"/>"
+                    ,'highestEducation':"<c:out value="${workStaffBasicInfo.highestEducation}"/>"
                     ,"entryDate":"<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>"
                     <shiro:hasPermission name="workstaff:workStaffBasicInfo:edit">,"canedit":"1"</shiro:hasPermission>
                     <shiro:hasPermission name="workstaff:workStaffBasicInfo:del">,"candelete":"1"</shiro:hasPermission>