项目归档页面调整

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

@@ -31,6 +31,7 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private String officeId;		// 部门id
 	private String recordNum;		// 归档申请编号
 	private String fileNum;		// 档案号
+	private String fileNumTow;		// 确认档案号
 	private String name;		// 档案名称
 	private Date recordDate;		// 归档日期
 	private String status;		// 归档申请状态
@@ -339,4 +340,12 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setFlag(String flag) {
 		this.flag = flag;
 	}
+
+	public String getFileNumTow() {
+		return fileNumTow;
+	}
+
+	public void setFileNumTow(String fileNumTow) {
+		this.fileNumTow = fileNumTow;
+	}
 }

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

@@ -393,6 +393,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			flag = "yes";
 		}
 		projectReportRecord.setFileNum(reportRecord.getFileNum());
+		projectReportRecord.setFileNumTow(reportRecord.getFileNumTow());
 		projectReportRecord.setName(reportRecord.getName());
 		projectReportRecord.setAccomplishDate(new Date());
 		User user= UserUtils.get(projectReportRecord.getCreateBy().getId());

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

@@ -15,6 +15,7 @@
 		a.office_id AS "officeId",
 		a.record_num AS "recordNum",
 		a.file_num AS "fileNum",
+		a.file_num_tow AS "fileNumTow",
 		a.name AS "name",
 		a.record_date AS "recordDate",
 		a.accomplish_date AS "accomplishDate",
@@ -216,6 +217,7 @@
 			office_id,
 			record_num,
 			file_num,
+			file_num_tow,
 			name,
 			record_date,
 			status,
@@ -236,6 +238,7 @@
 			#{officeId},
 			#{recordNum},
 			#{fileNum},
+			#{fileNumTow},
 			#{name},
 			#{recordDate},
 			#{status},
@@ -256,6 +259,7 @@
 			office_id = #{officeId},
 			record_num = #{recordNum},
 			file_num = #{fileNum},
+			file_num_tow= #{fileNumTow},
 			name = #{name},
 			record_date = #{recordDate},
 			accomplish_date = #{accomplishDate},
@@ -277,6 +281,7 @@
 			office_id = #{officeId},
 			record_num = #{recordNum},
 			file_num = #{fileNum},
+			file_num_tow= #{fileNumTow},
 			name = #{name},
 			record_date = #{recordDate},
 			accomplish_date = #{accomplishDate},

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

@@ -101,6 +101,7 @@
 		a.office_id AS "officeId",
 		a.record_num AS "recordNum",
 		a.file_num AS "fileNum",
+		a.file_num_tow AS "fileNumTow",
 		a.name AS "name",
 		a.record_date AS "recordDate",
 		a.accomplish_date AS "accomplishDate",
@@ -873,6 +874,7 @@
 		office_id,
 		record_num,
 		file_num,
+		file_num_tow,
 		name,
 		record_date,
 		status,
@@ -893,6 +895,7 @@
 		#{officeId},
 		#{recordNum},
 		#{fileNum},
+		#{fileNumTow},
 		#{name},
 		#{recordDate},
 		#{status},
@@ -913,6 +916,7 @@
 		office_id = #{officeId},
 		record_num = #{recordNum},
 		file_num = #{fileNum},
+		file_num_tow= #{fileNumTow},
 		name = #{name},
 		record_date = #{recordDate},
 		status = #{status},

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

@@ -66,6 +66,28 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
+					<div class="layui-input-block">
+						<div class="input-group">
+							<input htmlEscape="false" id="fileNum" name="fileNum"  class="form-control required layui-input" value="${projectReportRecord.fileNum}"/>
+							<span class="input-group-btn">
+								<label class="form-status">
+									<c:choose>
+										<c:when test="${not empty projectReportRecord.status}">${fns:getDictLabel(projectReportRecord.status, 'audit_record_state', '')}
+										</c:when>
+										<c:otherwise>新添</c:otherwise>
+									</c:choose></label>
+							 </span>
+						</div>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
+					<div class="layui-input-block">
+						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input required form-control" equalTo="#fileNum"/>
+					</div>
+				</div>
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -80,7 +102,7 @@
 							 </span>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">签字造价师一：</label>
 					<div class="layui-input-block">
@@ -141,24 +163,18 @@
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.createBy.name}"/>
 					</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">
 						<input 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"><span class="require-item">*</span>案卷号：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false" name="fileNum"  class="form-control required layui-input" value="${projectReportRecord.fileNum}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
+				</div>--%>
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>档案名称：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" name="name"  class="form-control required layui-input" value="${projectReportRecord.name}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">提交归档时间：</label>
 					<div class="layui-input-block">

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

@@ -105,6 +105,28 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>案卷号：</label>
+					<div class="layui-input-block">
+						<div class="input-group">
+							<input htmlEscape="false" id="fileNum" name="fileNum"  class="form-control required layui-input" value="${projectReportRecord.fileNum}"/>
+							<span class="input-group-btn">
+								<label class="form-status">
+									<c:choose>
+										<c:when test="${not empty projectReportRecord.status}">${fns:getDictLabel(projectReportRecord.status, 'audit_record_state', '')}
+										</c:when>
+										<c:otherwise>新添</c:otherwise>
+									</c:choose></label>
+							 </span>
+						</div>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
+					<div class="layui-input-block">
+						<input id="fileNumTow" name="fileNumTow" type="text"  class="layui-input required form-control" equalTo="#fileNum"/>
+					</div>
+				</div>
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>归档申请编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -119,7 +141,7 @@
 							 </span>
 						</div>
 					</div>
-				</div>
+				</div>--%>
 				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>签字造价师一：</label>
 					<div class="layui-input-block with-icon">
@@ -182,13 +204,13 @@
 						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>申请日期：</label>
 					<div class="layui-input-block">
 						<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>--%>
+				<%--<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"/>
@@ -199,7 +221,7 @@
 					<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>
 					<div class="layui-input-block">

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

@@ -20,6 +20,28 @@
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
+				<label class="layui-form-label">案卷号：</label>
+				<div class="layui-input-block">
+					<div class="input-group">
+						<input htmlEscape="false" id="fileNum" readonly="true" name="fileNum"  class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
+						<span class="input-group-btn">
+								<label class="form-status">
+									<c:choose>
+										<c:when test="${not empty projectReportRecord.status}">${fns:getDictLabel(projectReportRecord.status, 'audit_record_state', '')}
+										</c:when>
+										<c:otherwise>新添</c:otherwise>
+									</c:choose></label>
+							 </span>
+					</div>
+				</div>
+			</div>
+			<div class="layui-item layui-col-sm6">
+				<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"/>
+				</div>
+			</div>
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">归档申请编号：</label>
 				<div class="layui-input-block">
 					<div class="input-group">
@@ -34,7 +56,7 @@
 							 </span>
 					</div>
 				</div>
-			</div>
+			</div>--%>
 			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">签字造价师一：</label>
 				<div class="layui-input-block">
@@ -95,13 +117,13 @@
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.createBy.name}"/>
 				</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">
 					<input 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">
+			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">案卷号：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
@@ -112,7 +134,7 @@
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.name}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">提交归档时间：</label>
 				<div class="layui-input-block">

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordView.jsp

@@ -54,6 +54,12 @@
 					</div>
 				</div>
 			</div>
+			<div class="layui-item layui-col-sm6">
+				<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="${projectReportRecord.fileNumTow}"/>
+				</div>
+			</div>
 			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">签字造价师一：</label>
 				<div class="layui-input-block">
@@ -114,24 +120,24 @@
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.createBy.name}"/>
 				</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">
 					<input 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">
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">案卷号：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
 				</div>
-			</div>--%>
+			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">档案名称：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.name}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">提交归档时间：</label>
 				<div class="layui-input-block">

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

@@ -54,6 +54,12 @@
 					</div>
 				</div>
 			</div>
+			<div class="layui-item layui-col-sm6">
+				<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="${projectReportRecord.fileNumTow}"/>
+				</div>
+			</div>
 			<%--<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">签字造价师一：</label>
 				<div class="layui-input-block">
@@ -114,24 +120,24 @@
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.createBy.name}"/>
 				</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">
 					<input 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">
+			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">案卷号：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.fileNum}"/>
 				</div>
-			</div>--%>
+			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">档案名称：</label>
 				<div class="layui-input-block">
 					<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectReportRecord.name}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">提交归档时间：</label>
 				<div class="layui-input-block">
@@ -141,7 +147,7 @@
 			<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"/>"/>
+					<input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd"/>"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm12  with-textarea">