在报告表里添加一个审核通过时间字段、修改定时任务：查询超期未上报提醒代码逻辑

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

@@ -101,6 +101,7 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String recordNum;     //归档申请编号
 	private String templateTypeName;
 	private String conditionType;   //判断条件
+	private Date auditPassDate;   //审核通过日期
 
 
 	public String getUpId() {
@@ -616,4 +617,12 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setInstallRate(Double installRate) {
 		this.installRate = installRate;
 	}
+
+	public Date getAuditPassDate() {
+		return auditPassDate;
+	}
+
+	public void setAuditPassDate(Date auditPassDate) {
+		this.auditPassDate = auditPassDate;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -480,6 +480,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         synchronized (SYN_BYTE) {
                             String reportNo = createReportNo(reportData.getConditionType());
                             projectReportData.setNumber(reportNo);
+                            //添加审核通过日期
+                            projectReportData.setAuditPassDate(new Date());
                         }
                         //projectReportDataService.updateNumber(projectReportData);
                         workActivityProcess.setIsApproval("1");

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

@@ -1197,6 +1197,52 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/projectrecord/workContentFromAndView/workFollowView";
 					}
 
+				} else if (workProjectNotify.getType().equals("94")) {    //项目登记
+					boolean flag = false;
+					//通过通知信息id获取项目登记对象
+					ProjectRecords projectRecords = projectRecordsService.get(workProjectNotify.getNotifyId());
+					RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(workProjectNotify.getNotifyId());
+					if (projectRecords != null && StringUtils.isNotBlank(projectRecords.getId())) {
+						projectRecordsService.queryProjectDetail(projectRecords);
+						flag = true;
+					}
+					if (flag){
+						projectRecords.setAct(getByAct(projectRecords.getProcessInstanceId()));
+						projectRecords.setHome("home");
+						model.addAttribute("processInstanceId", projectRecords.getProcessInstanceId());
+						model.addAttribute("projectRecords", projectRecords);
+						if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+							return "modules/projectrecord/projectRecordsAudit";
+						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+							return "modules/projectrecord/projectRecordsModify";
+						} else {
+							return "modules/projectrecord/projectRecordsView";
+						}
+					}else {
+						if (ruralProjectRecords != null && StringUtils.isNotBlank(ruralProjectRecords.getId())) {
+							ruralProjectRecordsService.queryProjectDetail(ruralProjectRecords);
+							ProjectPlanInfo projectPlanInfo = new ProjectPlanInfo();
+							projectPlanInfo.setProjectId(ruralProjectRecords.getId());
+							//获取项目计划信息
+							List<ProjectPlanInfo> projectPlanList = projectPlanService.getProjectPlanList(projectPlanInfo);
+							//项目计划附件信息
+							List<WorkClientAttachment> projectPlanAttachment = projectPlanService.getWorkAttachment(ruralProjectRecords.getId());
+							ruralProjectRecords.setProjectPlanList(projectPlanList);
+							ruralProjectRecords.setWorkAttachments(projectPlanAttachment);
+						}
+						ruralProjectRecords.setAct(getByAct(ruralProjectRecords.getProcessInstanceId()));
+						ruralProjectRecords.setHome("home");
+						model.addAttribute("processInstanceId", ruralProjectRecords.getProcessInstanceId());
+						model.addAttribute("projectRecords", ruralProjectRecords);
+						if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
+						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+							return "modules/ruralprojectrecords/ruralProjectRecordsModify";
+						} else {
+							return "modules/ruralprojectrecords/ruralProjectRecordsView";
+						}
+					}
+
 				} else if (workProjectNotify.getType().equals("131")) {    //项目计划通知
 					boolean flag = false;
 					//通过通知信息id获取项目登记对象

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

@@ -639,6 +639,9 @@
 		<if test="installRate != null and installRate != ''">
 			,install_rate = #{installRate}
 		</if>
+		<if test="auditPassDate != null and auditPassDate != ''">
+			,audit_pass_date = #{auditPassDate}
+		</if>
 		WHERE id = #{id}
 	</update>
 

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

@@ -902,7 +902,7 @@
 	<select id="getProjectReportedListByAdvent" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>
-			,date_add(date_format(prd.update_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
+			,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
 			,a.project_type as "projectType"
 			FROM rural_project_records a
 			left join work_contract_info wci on a.contract_id = wci.id
@@ -918,7 +918,7 @@
 			a.del_flag = 0
 			and (a.reported_state!=5 or a.reported_state is null)
 			and prd.status = 5
-			and now() between date_add(prd.update_date,interval #{startCount} day) and date_add(prd.update_date,interval #{endingCount} day)
+			and now() between date_add(prd.audit_pass_date,interval #{startCount} day) and date_add(prd.audit_pass_date,interval #{endingCount} day)
 		</where>
 	</select>
 </mapper>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -730,8 +730,8 @@
             <div class="layui-item nav-btns">
                 <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
             </div>
-            <div class="layui-item layui-col-xs12 form-table-container" >
-                <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin">
+            <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
+                <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details">
                     <thead>
                     <tr>
                         <th width="200px"><font color="red">*</font>财务科目</th>