电子归档流程修改

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

@@ -55,6 +55,8 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	private String flag;    //判定条件
 	private String holdFlag;    //暂存判定条件
 	private String referenceRemarks;    //备考表内容信息
+	private String referenceAttachmentId;    //备考表附件id
+	private String catalogueAttachmentId;    //目录附件id
 
 	private List<ProjectTemplateInfo> fileAttachmentList;   //报告文件
 	private List<ProjectTemplateInfo> fileGistdataList;   //依据性文件
@@ -413,4 +415,20 @@ public class ProjectReportRecord extends ActEntity<ProjectReportRecord> {
 	public void setReferenceRemarks(String referenceRemarks) {
 		this.referenceRemarks = referenceRemarks;
 	}
+
+	public String getReferenceAttachmentId() {
+		return referenceAttachmentId;
+	}
+
+	public void setReferenceAttachmentId(String referenceAttachmentId) {
+		this.referenceAttachmentId = referenceAttachmentId;
+	}
+
+	public String getCatalogueAttachmentId() {
+		return catalogueAttachmentId;
+	}
+
+	public void setCatalogueAttachmentId(String catalogueAttachmentId) {
+		this.catalogueAttachmentId = catalogueAttachmentId;
+	}
 }

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

@@ -937,6 +937,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			saveWorkattachments(reportRecord);
 			flag = "yes";
 		}
+		projectReportRecord.setReferenceRemarks(reportRecord.getReferenceRemarks());
 		projectReportRecord.setFileNum(reportRecord.getFileNum());
 		projectReportRecord.setFileNumTow(reportRecord.getFileNumTow());
 		projectReportRecord.setName(reportRecord.getName());
@@ -970,6 +971,8 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			workActivityMenu.setProcessType(activitieList.get(0).getProcessKey());
 			workActivityMenu.setActivities(activitieList);
 		}
+		//获取项目信息
+		RuralProjectRecords record = ruralProjectRecordsService.getById(reportRecord.getReport().getProject().getId());
 
 		WorkActivityProcess workActivityProcess = new WorkActivityProcess();
 		WorkActivityProcess selectProcess = new WorkActivityProcess();
@@ -1036,6 +1039,46 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 					if ("yes".equals(flag)) {
 						workActivityProcessService.insertAuditsByType(auditUsers,reportRecord.getProcessInstanceId(),2,1);
 
+						//判定为非全过程项目进行备考表信息处理
+						if(!"3".equals(record.getProjectType())){
+							//查询其他资料对应附件结构信息
+							ProjectTemplateInfo templateInfo = projectTemplateDao.getProjectTemplateInfoByName("其他资料");
+							//获取上传阿里云盘文件地址
+							String uploadFilePath = downloadReference(reportRecord, record);
+							if(StringUtils.isNotBlank(uploadFilePath)){
+								//将备考表添加到附件中
+								Workattachment workattachment = new Workattachment();
+								workattachment.setAttachmentId(templateInfo.getId());
+								workattachment.setProjectId(record.getId());
+								workattachment.setUrl(uploadFilePath);
+								workattachment.setType("doc");
+								workattachment.setAttachmentFlag("100");
+								workattachment.setAttachmentName("备考表.doc");
+								workattachment.setAttachmentUser(UserUtils.getUser().getId());
+								workattachmentService.insertOnWorkAttachment(workattachment);
+								//添加备考表附件id
+								projectReportRecord.setReferenceAttachmentId(workattachment.getId());
+							}
+							//生成文件目录
+							//获取上传阿里云盘文件地址
+							String uploadCatalogueFilePath = downloadCatalogue(record.getId());
+
+							if(StringUtils.isNotBlank(uploadCatalogueFilePath)){
+								//将备考表添加到附件中
+								Workattachment workattachment = new Workattachment();
+								workattachment.setAttachmentId(templateInfo.getId());
+								workattachment.setProjectId(record.getId());
+								workattachment.setUrl(uploadCatalogueFilePath);
+								workattachment.setType("doc");
+								workattachment.setAttachmentFlag("100");
+								workattachment.setAttachmentName("文件目录.doc");
+								workattachment.setAttachmentUser(UserUtils.getUser().getId());
+								workattachment.setCompanyId(UserUtils.getSelectCompany().getId());
+								workattachmentService.insertOnWorkAttachment(workattachment);
+								//添加目录附件id
+								projectReportRecord.setCatalogueAttachmentId(workattachment.getId());
+							}
+						}
 						notifyRole = "报告归档管理员审批";
 						workActivityProcess.setIsApproval("1");
 						enname = "bzshb";
@@ -1092,8 +1135,6 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		boolean state = actTaskService.isProcessEnd(act.getProcInsId());
 		List<User> users = new ArrayList<>();
 		List<User> userList = new ArrayList<>();
-		//获取项目信息
-		RuralProjectRecords record = ruralProjectRecordsService.getById(reportRecord.getReport().getProject().getId());
 
 		if (!state) {
 			String titleStr = "项目【"+ record.getProjectName()+"】归档完成";
@@ -1108,6 +1149,22 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 				projectReportData.setFileStatus("3");
 				projectReportDataService.updateFileStatus(projectReportData);
 				projectReportRecord.setStatus("5");
+
+				//修改审批状态
+				if(!"3".equals(record.getProjectType())){
+
+					//修改项目表中上报状态
+					//判断项目是否超期，如果超期则将上报标志改为超期上报（7） 否则变更为正常上报数据
+					if(1 == record.getOverRecordStatus()){
+						record.setProjectRecordStatus(7);
+						//修改项目归档表中状态
+						projectReportRecord.setStatus("7");
+					}else{
+						record.setProjectRecordStatus(5);
+					}
+
+				}
+
 				WorkProjectNotify notify = new WorkProjectNotify();
 				notify.setNotifyId(projectReportRecord.getId());
 				userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1260,6 +1317,16 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		if (1 == projectReportRecord.getType()){
 			dao.update(projectReportRecord);
 		}else if(2 == projectReportRecord.getType()){
+			if (StringUtils.isNotBlank(projectReportRecord.getReferenceAttachmentId()) && StringUtils.isNotBlank(reportRecord.getReferenceAttachmentId())) {
+				if(!projectReportRecord.getReferenceAttachmentId().equals(reportRecord.getReferenceAttachmentId())){
+					workattachmentService.deleteById(reportRecord.getReferenceAttachmentId());
+				}
+			}
+			if (StringUtils.isNotBlank(projectReportRecord.getCatalogueAttachmentId()) && StringUtils.isNotBlank(reportRecord.getCatalogueAttachmentId())) {
+				if(!projectReportRecord.getCatalogueAttachmentId().equals(reportRecord.getCatalogueAttachmentId())){
+					workattachmentService.deleteById(reportRecord.getCatalogueAttachmentId());
+				}
+			}
 			dao.updateRuralProjectReportRecord(projectReportRecord);
 		}
 		return "保存审核意见成功！";

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -22,6 +22,7 @@ import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.sys.dao.UserDao;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -67,6 +68,8 @@ public class ProjectReportRecordController extends BaseController {
 	private RuralProjectRecordsService projectRecordsService;
 	@Autowired
 	private ProjectMaterialDefectRecordService materialDefectRecordService;
+	@Autowired
+	private UserDao userDao;
 
 	@ModelAttribute
 	public ProjectReportRecord get(@RequestParam(required=false) String id) {
@@ -509,6 +512,12 @@ public class ProjectReportRecordController extends BaseController {
 				users = Lists.newArrayList();
 				//查询总审人员信息（新增报告选择得总审人员）
 				User zsUser = UserUtils.get(reportData.getBzshbUserId());
+
+				//查询总审人员Id
+				String bzshbUserId = userDao.getAuditUserListByBzshbUserId(reportData.getBzshbUserId());
+				if(StringUtils.isNotBlank(bzshbUserId)){
+					zsUser = UserUtils.get(bzshbUserId);
+				}
 				users.add(zsUser);
 			}else if ("bzshb".equals(taskDefKey)){
 				users = UserUtils.getByProssType(projectReportRecord.getProcessInstanceId(),5);

src/main/java/com/jeeplus/modules/sys/dao/WorkattachmentDao.java

@@ -71,4 +71,10 @@ public interface WorkattachmentDao extends CrudDao<Workattachment> {
      * @param workattachment
      */
     void deleteByAttachIdAndProject(WorkClientAttachment workattachment);
+
+    /**
+     * 删除信息
+     * @param id
+     */
+    Integer deleteById(String id);
 }

src/main/java/com/jeeplus/modules/sys/service/WorkattachmentService.java

@@ -646,4 +646,13 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	public void deleteByAttachIdAndProject(WorkClientAttachment workattachment) {
 		dao.deleteByAttachIdAndProject(workattachment);
 	}
+
+	/**
+	 * 删除对应数据信息
+	 * @param id
+	 */
+	@Transactional(readOnly = false)
+	public void deleteById(String id) {
+		dao.deleteById(id);
+	}
 }

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

@@ -3685,6 +3685,11 @@ public class WorkProjectNotifyController extends BaseController {
 						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 						model.addAttribute("identification","projectcontentinfoFile");
 						model.addAttribute("identificationName","归档审核意见");
+						if("bzshb".equals(act.getTaskDefKey())){
+							model.addAttribute("type","1");
+						}else{
+							model.addAttribute("type","0");
+						}
 						return "modules/ruralprojectrecords/record/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/ruralprojectrecords/record/projectReportRecordModifyApply";

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

@@ -26,7 +26,10 @@
 		a.sign_cost_two AS "signCostTwo.id",
 		u.name AS "createBy.name",
 		d.name AS "report.name",
-		d.number AS "report.number"
+		d.number AS "report.number",
+		a.reference_remarks as "referenceRemarks",
+		a.reference_attachment_id as "referenceAttachmentId",
+		a.catalogue_attachment_id as "catalogueAttachmentId"
 	</sql>
 
 	<sql id="projectMaterialDefectRecordColumns">
@@ -181,7 +184,7 @@
 				AND a.create_date &lt;= #{endDate}
 			</if>
 			<if test="name != null and name != ''">
-				AND a.name LIKE 
+				AND a.name LIKE
 					<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
 					<if test="dbName == 'mssql'">'%'+#{name}+'%'</if>
 					<if test="dbName == 'mysql'">concat('%',#{name},'%')</if>
@@ -221,15 +224,15 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<select id="findAllList" resultType="ProjectReportRecord" >
-		SELECT 
+		SELECT
 			<include refid="projectReportRecordColumns"/>
 		FROM project_report_record a
 		<include refid="projectReportRecordJoins"/>
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
-		</where>		
+		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
@@ -239,7 +242,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	
+
 	<insert id="insert">
 		INSERT INTO project_report_record(
 			id,
@@ -285,9 +288,9 @@
 			#{processInstanceId}
 		)
 	</insert>
-	
+
 	<update id="update">
-		UPDATE project_report_record SET 	
+		UPDATE project_report_record SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks},
@@ -327,24 +330,33 @@
 			sign_cost_one = #{signCostOne.id},
 			sign_cost_two = #{signCostTwo.id},
 			process_instance_id = #{processInstanceId}
+			<if test="null != referenceRemarks and '' != referenceRemarks">
+				,reference_remarks = #{referenceRemarks}
+			</if>
+			<if test="null != referenceAttachmentId and '' != referenceAttachmentId">
+				,reference_attachment_id = #{referenceAttachmentId}
+			</if>
+			<if test="null != catalogueAttachmentId and '' != catalogueAttachmentId">
+				,catalogue_attachment_id = #{catalogueAttachmentId}
+			</if>
 		WHERE id = #{id}
 	</update>
-	
-	
+
+
 	<!--物理删除-->
 	<update id="delete">
 		DELETE FROM project_report_record
 		WHERE id = #{id}
 	</update>
-	
+
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
 		UPDATE project_report_record SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
-	
-	
+
+
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="ProjectReportRecord" statementType="STATEMENT">
 		select * FROM project_report_record  where ${propertyName} = '${value}'

src/main/resources/mappings/modules/sys/WorkattachmentDao.xml

@@ -363,4 +363,9 @@
 		and project_id = #{projectId}
 	</delete>
 
+	<delete id="deleteById">
+		DELETE FROM work_attachment
+		WHERE id = #{id}
+	</delete>
+
 </mapper>

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

@@ -1062,23 +1062,23 @@
 							if(d.emergencyProject == 1){
 								/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 								if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
 								}
 								if(d.projectReportRecordStatus == 2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 								}
 								if(d.projectReportRecordStatus == 4){
 									//驳回操作
-									if(d.recordNotifyFlag == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-									}else{
+									if(d.newRecordNotifyFlag == 1){
 										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+									}else{
+										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 									}
 								}
 							}
@@ -1087,24 +1087,24 @@
 						if(d.projectReportStatusTwo == 5){
 							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
 
 							}
 							if(d.projectReportRecordStatus == 2){
 								xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 3){
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 4){
 								//驳回操作
-								if(d.recordNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-								}else{
+								if(d.newRecordNotifyFlag == 1){
 									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+								}else{
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 								}
 							}
 						}

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -100,6 +100,8 @@
 		<form:hidden path="act.procInsId"/>
 		<form:hidden path="act.procDefId"/>
 		<form:hidden id="flag" path="act.flag"/>
+		<form:hidden path="referenceAttachmentId"/>
+		<form:hidden path="catalogueAttachmentId"/>
 		<input type="hidden" id="opinion" name="act.comment" value="" maxlength="250">
 		<sys:message content="${message}"/>
 			<div class="form-group layui-row first lw12">
@@ -1391,7 +1393,17 @@
 <%--					</div>--%>
 <%--				</div>--%>
 <%--			</div>--%>
-
+			<c:if test="${type != '1'}">
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>备考表</h2></div>
+					<div class="layui-item layui-col-sm11 with-textarea">
+						<label class="layui-form-label "><span class="require-item">*</span>备考表：</label>
+						<div class="layui-input-block">
+							<form:textarea placeholder="请输入备考表内容" path="referenceRemarks" htmlEscape="false" rows="7"  maxlength="500"  class="form-control required"/>
+						</div>
+					</div>
+				</div>
+			</c:if>
 
 			<div class="form-group layui-row page-end"></div>
 		</form:form>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordModifyApply.jsp

@@ -176,6 +176,8 @@
 			<form:hidden path="act.procDefId"/>
 			<form:hidden id="flag" path="act.flag"/>
 			<form:hidden path="report.name"/>
+			<form:hidden path="referenceAttachmentId"/>
+			<form:hidden path="catalogueAttachmentId"/>
 
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>

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

@@ -1061,23 +1061,23 @@
 							if(d.emergencyProject == 1){
 								/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 								if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 								}
 								if(d.projectReportRecordStatus == 2){
 									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
 								}
 								if(d.projectReportRecordStatus == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 								}
 								if(d.projectReportRecordStatus == 4){
 									//驳回操作
-									if(d.recordNotifyFlag == 1){
-										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-									}else{
+									if(d.newRecordNotifyFlag == 1){
 										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+									}else{
+										xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 									}
 								}
 							}
@@ -1086,23 +1086,23 @@
 						if(d.projectReportStatusTwo == 5){
 							/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 							if(d.projectReportRecordStatus == 0 || d.projectReportRecordStatus == 6){
-								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 1){
-								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 2){
 								xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回线上归档</a>";
 							}
 							if(d.projectReportRecordStatus == 3){
-								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
+								xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 							}
 							if(d.projectReportRecordStatus == 4){
 								//驳回操作
-								if(d.recordNotifyFlag == 1){
-									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
-								}else{
+								if(d.newRecordNotifyFlag == 1){
 									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessageNew/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
+								}else{
+									xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 								}
 							}
 						}