上报超期未上报数据导出

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

@@ -7,6 +7,7 @@ import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectSignatureOldMessageDisposeService;
 import com.jeeplus.modules.workcalendar.entity.WorkCalendar;
+import com.jeeplus.modules.workcontractrecord.service.WorkContractRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,8 @@ public class WorkCalendarTaskService  {
     private RuralProjectRecordsService projectRecordsService;
     @Autowired
     private RuralProjectSignatureOldMessageDisposeService ruralProjectSignatureOldMessageDispose;
+    @Autowired
+    private WorkContractRecordService workContractRecordService;
 
     @Scheduled(cron= "0 0/1 * * * ?")
     public void notifyTask() {
@@ -118,12 +121,15 @@ public class WorkCalendarTaskService  {
         logger.info("-----------项目超期未归档定时任务开始（电子归档）------------------");
         projectRecordsService.saveProjectRecordListByAdvent();
         logger.info("------------项目超期未归档定时任务结束（电子归档）------------------");
+        /*logger.info("-----------合同超期未归档定时任务开始------------------");
+        workContractRecordService.saveContractRecordListByAdvent();
+        logger.info("------------合同超期未归档定时任务结束------------------");*/
     }
 
     /**
      * 每五分钟对签章文件进行文件位置转移处理
      */
-    @Scheduled(cron= "0 0/5 * * * ?")
+    @Scheduled(cron= "0 0/3 * * * ?")
     @Transactional(readOnly = false)
     public void getProjectSignatureOldMessageDispose() {
         logger.info("--------------处理审定单签章文件（开始）---------------");

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

@@ -1071,6 +1071,7 @@ END) as projectScale*/
 		<where>
 			a.status = 5
 			and prd.status = 5
+			AND a.reported_state != '10'
 			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
 			and rprr.report_status is null
 			<choose>