电子归档审核页面调整

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

@@ -25,7 +25,7 @@ import java.util.Map;
  * @version 2018-06-22
  */
 public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private ProjectReportData report;		// 报告id
 	private String companyId;		// 公司id
@@ -58,6 +58,8 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private List<ProjectTemplateInfo> fileAttachmentList;   //报告文件
 	private List<ProjectTemplateInfo> fileGistdataList;   //依据性文件
 	private List<ProjectTemplateInfo> fileOtherList;   //其他文件
+	private ProjectReportData projectReportData;		// 报告信息（仅作为展示用）
+	private List<String> chargeCriterionList;	//合同收费标准
 
 	private Integer type;//(1：ProjectReportRecord  2：RuralProjectReportRecord)
 
@@ -113,7 +115,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setCompanyId(String companyId) {
 		this.companyId = companyId;
 	}
-	
+
 	@ExcelField(title="部门id", align=2, sort=9)
 	public String getOfficeId() {
 		return officeId;
@@ -122,7 +124,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setOfficeId(String officeId) {
 		this.officeId = officeId;
 	}
-	
+
 	@ExcelField(title="归档申请编号", align=2, sort=10)
 	public String getRecordNum() {
 		return recordNum;
@@ -131,7 +133,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setRecordNum(String recordNum) {
 		this.recordNum = recordNum;
 	}
-	
+
 	@ExcelField(title="档案号", align=2, sort=11)
 	public String getFileNum() {
 		return fileNum;
@@ -140,7 +142,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setFileNum(String fileNum) {
 		this.fileNum = fileNum;
 	}
-	
+
 	@ExcelField(title="档案名称", align=2, sort=12)
 	public String getName() {
 		return name;
@@ -149,7 +151,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ExcelField(title="归档日期", align=2, sort=13)
 	public Date getRecordDate() {
@@ -159,7 +161,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setRecordDate(Date recordDate) {
 		this.recordDate = recordDate;
 	}
-	
+
 	@ExcelField(title="归档状态", align=2, sort=14)
 	public String getStatus() {
 		return status;
@@ -168,7 +170,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setStatus(String status) {
 		this.status = status;
 	}
-	
+
 	@ExcelField(title="流程号", align=2, sort=15)
 	public String getProcessInstanceId() {
 		return processInstanceId;
@@ -386,4 +388,20 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setHoldFlag(String holdFlag) {
 		this.holdFlag = holdFlag;
 	}
-}
+
+	public ProjectReportData getProjectReportData() {
+		return projectReportData;
+	}
+
+	public void setProjectReportData(ProjectReportData projectReportData) {
+		this.projectReportData = projectReportData;
+	}
+
+	public List<String> getChargeCriterionList() {
+		return chargeCriterionList;
+	}
+
+	public void setChargeCriterionList(List<String> chargeCriterionList) {
+		this.chargeCriterionList = chargeCriterionList;
+	}
+}

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

@@ -2843,8 +2843,31 @@ public class WorkProjectNotifyController extends BaseController {
 							return "modules/processProjectReportRecord/projectReportRecordView";
 						}
 					}
+					ProjectReportData projectReportData = projectReportDataService.getOnRural(projectReportRecord.getReport().getId());
+					projectReportRecord.setProjectReportData(projectReportData);
+					Projectcontentinfo projectcontentinfo = projectcontentinfoService.getByInfoId(projectReportData.getId());
+					projectcontentinfo.setProjectReportData(projectReportData);
 					//获取项目信息
-					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectReportRecord.getReport().getProject().getId());
+					//RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(projectReportRecord.getReport().getProject().getId());
+					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.getQueryProjectUsers(projectReportRecord.getReport().getProject().getId());
+					//获取子项目列表信息
+					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(ruralProjectRecords.getId());
+					//获取合同信息
+					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);
+						}
+					}
+
 					Act act = getByAct(projectReportRecord.getProcessInstanceId());
 					projectReportRecord.setAct(act);
 
@@ -2963,6 +2986,10 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 					//}
 					projectReportRecord.setUploadMode(uploadMode);
+					model.addAttribute("projectcontentinfo", projectcontentinfo);
+					model.addAttribute("projectRecords", ruralProjectRecords);
+					model.addAttribute("projectReportData", projectReportData);
+					model.addAttribute("workContractInfo", workContractInfo);
 					model.addAttribute("projectReportRecord", projectReportRecord);
 					model.addAttribute("project", projectReportRecord.getReport().getProject());
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {

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

@@ -202,13 +202,13 @@
 				<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="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<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="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<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">