归档提交修改 档案号，档案号（归档员输入）

添加提交归档时间，归档完成时间

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

@@ -3,12 +3,7 @@
  */
 package com.jeeplus.modules.projectcontentinfo.entity;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import com.google.common.collect.Lists;
 import com.jeeplus.common.persistence.ActEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
@@ -19,6 +14,10 @@ import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 报告归档Entity
  * @author 杨帆
@@ -38,6 +37,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private String processInstanceId;		// 流程号
 	private Date startDate; //开始日期
 	private Date endDate; //结束日期
+	private Date accomplishDate;  //归档完成时间
 	private String clientName;
 	private String contractNum;
 	private String projectName;
@@ -293,4 +293,14 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setSignCostTwo(User signCostTwo) {
 		this.signCostTwo = signCostTwo;
 	}
+
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getAccomplishDate() {
+		return accomplishDate;
+	}
+
+	public void setAccomplishDate(Date accomplishDate) {
+		this.accomplishDate = accomplishDate;
+	}
 }

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

@@ -3,15 +3,16 @@
  */
 package com.jeeplus.modules.projectcontentinfo.service;
 
-import java.util.*;
-
 import com.google.common.collect.Maps;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.websocket.onchat.ChatServerPool;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportRecordDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -30,15 +31,11 @@ import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import org.activiti.engine.*;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
-import org.java_websocket.WebSocket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.service.CrudService;
-import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
-import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportRecordDao;
+import java.util.*;
 
 /**
  * 报告归档归档Service
@@ -376,6 +373,9 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			saveWorkattachments(reportRecord);
 			flag = "yes";
 		}
+		projectReportRecord.setFileNum(reportRecord.getFileNum());
+		projectReportRecord.setName(reportRecord.getName());
+		projectReportRecord.setAccomplishDate(new Date());
 		User user= UserUtils.get(projectReportRecord.getCreateBy().getId());
 		//String str = "报告归档发起人："+user.getName()+",报告归档编号:"+projectReportRecord.getRecordNum()+",报告名称："+projectReportRecord.getReport().getName();
 		String title =  "报告名称："+projectReportRecord.getReport().getName();

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

@@ -17,6 +17,7 @@
 		a.file_num AS "fileNum",
 		a.name AS "name",
 		a.record_date AS "recordDate",
+		a.accomplish_date AS "accomplishDate",
 		a.status AS "status",
 		a.number_count AS "numberCount",
 		a.process_instance_id AS "processInstanceId",
@@ -214,6 +215,7 @@
 			file_num = #{fileNum},
 			name = #{name},
 			record_date = #{recordDate},
+			accomplish_date = #{accomplishDate},
 			status = #{status},
 			number_count = #{numberCount},
 			sign_cost_one = #{signCostOne.id},

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -147,23 +147,30 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">档案号：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>档案号：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
+						<input htmlEscape="false" name="fileNum"  class="form-control required layui-input" value="${projectReportRecord.fileNum}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">档案名称：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>档案名称：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.name}"/>
+						<input htmlEscape="false" name="name"  class="form-control required layui-input" value="${projectReportRecord.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档时间：</label>
+					<label class="layui-form-label">提交归档时间：</label>
 					<div class="layui-input-block">
 						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">归档完成日期：</label>
+					<div class="layui-input-block">
+						<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="form-control  layui-input"
+							   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordForm.jsp

@@ -192,7 +192,7 @@
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">档案号：</label>
 					<div class="layui-input-block">
 						<form:input path="fileNum" htmlEscape="false"    class="form-control  layui-input"/>
@@ -203,14 +203,21 @@
 					<div class="layui-input-block">
 						<form:input path="name" htmlEscape="false"    class="form-control  layui-input"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档时间：</label>
+					<label class="layui-form-label">提交归档时间：</label>
 					<div class="layui-input-block">
 						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
 							   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">归档完成日期：</label>
+					<div class="layui-input-block">
+						<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date layui-input laydate-icon"
+							   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -186,7 +186,7 @@
 						<input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">档案号：</label>
 					<div class="layui-input-block">
 						<form:input path="fileNum" htmlEscape="false"    class="form-control  layui-input"/>
@@ -197,13 +197,20 @@
 					<div class="layui-input-block">
 						<form:input path="name" htmlEscape="false"    class="form-control  layui-input"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label">归档时间：</label>
+					<label class="layui-form-label">提交归档时间：</label>
 					<div class="layui-input-block">
 						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
+                <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">归档完成日期：</label>
+                    <div class="layui-input-block">
+                        <input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="form-control  layui-input"
+                               value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+                    </div>
+                </div>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordView.jsp

@@ -114,11 +114,17 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
-				<label class="layui-form-label">归档时间：</label>
+				<label class="layui-form-label">提交归档时间：</label>
 				<div class="layui-input-block">
 					<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
 				</div>
 			</div>
+			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">归档完成日期：</label>
+				<div class="layui-input-block">
+					<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+				</div>
+			</div>
 			<div class="layui-item layui-col-sm12  with-textarea">
 				<label class="layui-form-label">说明：</label>
 				<div class="layui-input-block">