报告签发审批时间节点为保存修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.ruralprojectrecords.dao;
 
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecordReportInfo;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
@@ -204,4 +205,17 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     Integer updatePlanInfo(ProjectRecords projectRecord);
+
+    /**
+     * 查询报告签发审批完成并且审批时间为null的数据的审批通过时间
+     * @return
+     */
+    List<ProjectReportDataTwo> getProjectReportTwoInfo();
+
+    /**
+     * 报告签发审批时间节点为保存修改
+     * @param info
+     * @return
+     */
+    Integer updateReportDataTwo(ProjectReportDataTwo info);
 }

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

@@ -25,6 +25,7 @@ import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingbatchRelation;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportDataTwo;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
@@ -2282,4 +2283,16 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public void updatePlanInfo(ProjectRecords projectRecord){
 		dao.updatePlanInfo(projectRecord);
 	}
+
+	/**
+	 * 报告签发审批完成审批时间未同步处理
+	 */
+	public void disposeProjectReportTwoInfo(){
+		//查询报告签发审批完成并且审批时间为null的数据的审批通过时间
+		List<ProjectReportDataTwo> projectReportTwoInfo = dao.getProjectReportTwoInfo();
+		//循环遍历修改报告签发对应数据的审核时间
+		for (ProjectReportDataTwo info : projectReportTwoInfo) {
+			dao.updateReportDataTwo(info);
+		}
+	}
 }

src/main/java/com/jeeplus/modules/workcalendar/service/WorkCalendarTaskService.java

@@ -120,5 +120,8 @@ public class WorkCalendarTaskService  {
         logger.info("-----------项目超期未归档定时任务开始（电子归档）------------------");
         projectRecordsService.saveProjectRecordListByAdvent();
         logger.info("------------项目超期未归档定时任务结束（电子归档）------------------");
+        logger.info("-----------报告签发审批完成审批时间未同步处理开始------------------");
+        projectRecordsService.disposeProjectReportTwoInfo();
+        logger.info("-----------报告签发审批完成审批时间未同步处理结束------------------");
     }
 }

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

@@ -1772,4 +1772,27 @@
 		plan_attachment_id = #{planAttachmentId}
 		where id = #{id}
 	</update>
+
+	<select id="getProjectReportTwoInfo" resultType="ProjectReportDataTwo">
+		select
+			t.create_date as "createDate",
+			t.process_instance_id as "processInstanceId"
+		from
+			work_activity_process t
+			join (
+					select
+					  substring_index( group_concat( id order by create_date desc ), ',', 1 ) as id
+					from
+					  work_activity_process
+					  where process_instance_id
+						in(select process_instance_id from project_report_data_two where status = 5 and audit_pass_date is null)
+					group by process_instance_id ) tmp
+		on t.id = tmp.id;
+	</select>
+
+	<update id="updateReportDataTwo">
+		update project_report_data_two
+		set audit_pass_date = #{createDate}
+		where process_instance_id = #{processInstanceId}
+	</update>
 </mapper>