项目到处文件修改

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

@@ -78,6 +78,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer projectRecordStatus; //归档状态(向目标)
 	private Integer overRecordStatus; //超期状态（电子归档）（0：未超期，1：已超期）
 	private Integer downProjectReportRecordStatus; //线下归档状态
+	private String downArchiveStatus; //线下归档状态
 
 	private String prrProcessInstanceId; //线上归档流程号
 	private String prrdProcessInstanceId; //线下归档流程号
@@ -1890,7 +1891,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 		this.recordState = recordState;
 	}
 
-	@ExcelField(title="完成状态", align=2, sort=19)
+	//@ExcelField(title="完成状态", align=2, sort=19)
 	public String getCompletionStatus() {
 		return completionStatus;
 	}
@@ -1898,6 +1899,16 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setCompletionStatus(String completionStatus) {
 		this.completionStatus = completionStatus;
 	}
+
+	@ExcelField(title="归档状态", align=2, sort=19)
+	public String getDownArchiveStatus() {
+		return downArchiveStatus;
+	}
+
+	public void setDownArchiveStatus(String downArchiveStatus) {
+		this.downArchiveStatus = downArchiveStatus;
+	}
+
 	//@ExcelField(title="咨询营业收入(万元)", align=2, sort=20)
 	public String getMoney() {
 		return money;

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

@@ -672,7 +672,7 @@ public class RuralProjectViewController extends BaseController {
         //查询项目报告信息
         ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(projectRecords.getId());
         model.addAttribute("flagProjectReportData",projectReportData);
-        return "modules/ruralprojectrecords/view/remodifyportedView";
+        return "modules/ruralprojectrecords/view/reportedView";
 
     }
 

src/main/java/com/jeeplus/modules/workfullmanage/service/WorkFullManageService.java

@@ -788,6 +788,7 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 
 		data.put("zixunyuanName","");
 		data.put("consultantName1","");
+		data.put("consultantMajor1","");
 		data.put("consultantProfession1","");
 		data.put("consultantQualification1","");
 		data.put("handSignature4",blankBase64);
@@ -799,6 +800,9 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 				zxyFlag ++;
 				User consultantUser = UserUtils.get(consultant.getZixunyuan());
 				data.put("consultantName1",consultantUser.getName());
+				if(StringUtils.isNotBlank(consultant.getMajor())){
+					data.put("consultantMajor1",consultant.getMajor());
+				}
 
 				//如果咨询员不为空，则对项咨询员进行获取签字章并存储
 				if(org.apache.commons.lang3.StringUtils.isNotBlank(consultantUser.getId())){
@@ -852,6 +856,11 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 		if(null != currentConsultant && org.apache.commons.lang3.StringUtils.isNotBlank(currentConsultant.getZixunyuanName())){
 			//项目负责人
 			data.put("projectMaster",currentConsultant.getZixunyuanName());
+			if(StringUtils.isNotBlank(currentConsultant.getMajor())){
+				data.put("masterMajor",currentConsultant.getMajor());
+			}else{
+				data.put("masterMajor","");
+			}
 		}else{
 			//项目负责人
 			data.put("projectMaster","");

src/main/resources/freemarker/current.ftl

@@ -1032,7 +1032,7 @@
 										  w:hint="eastAsia"/>
 								<w:sz w:val="28"/>
 							</w:rPr>
-							<w:t xml:space="preserve">项目负责人：${projectMaster}    </w:t>
+							<w:t xml:space="preserve">项目负责人：${projectMaster}</w:t>
 						</w:r>
 					</w:p>
 					<w:p w:rsidR="004C2168"
@@ -1091,7 +1091,7 @@
 										  w:hint="eastAsia"/>
 								<w:sz w:val="28"/>
 							</w:rPr>
-							<w:t xml:space="preserve">     从事专业：土建</w:t>
+							<w:t xml:space="preserve">     从事专业：${masterMajor}</w:t>
 						</w:r>
 					</w:p>
 					<w:p w:rsidR="004C2168"
@@ -1155,7 +1155,7 @@
 										  w:hint="eastAsia"/>
 								<w:sz w:val="28"/>
 							</w:rPr>
-							<w:t xml:space="preserve">     从事专业：安装    </w:t>
+							<w:t xml:space="preserve">     从事专业：${consultantMajor1}    </w:t>
 						</w:r>
 					</w:p>
 					<w:p w:rsidR="004C2168"

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

@@ -347,7 +347,12 @@ END) as projectScale*/
 		when a.submit_money = '2' then
 		ifnull(prrd.status,0) else 0
 		end) as downProjectReportRecordStatus,
-
+		(case
+		when a.submit_money = '1' and pfp.status = '5' then
+		'已归档'
+		when a.submit_money = '2' and ppf.status = '5' then
+		'已归档' else '未归档'
+		end) as downArchiveStatus,
 		/*,ifnull(prrd.status,0) as "downProjectReportRecordStatus"*/
 		prrd.file_num as recodeNum,
 		prr.process_instance_id as prrProcessInstanceId,