数据处理

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -112,7 +112,6 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String projectProperties;//投资性质
 	private List<String> permissionOfficeIdList;	//查询部门权限列表
 	private String projectMaterialStorageStatus; //项目材料状态  0 为无文件 1为有文件 2为已处理
-	private String id;
 
 
 
@@ -2262,14 +2261,4 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setprojectMaterialStorageStatus(String projectMaterialStorageStatus) {
 		this.projectMaterialStorageStatus = projectMaterialStorageStatus;
 	}
-
-	@Override
-	public String getId() {
-		return id;
-	}
-
-	@Override
-	public void setId(String id) {
-		this.id = id;
-	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectSignatureOldMessageDisposeController.java

@@ -180,28 +180,28 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         System.out.println(c.getActualMaximum(Calendar.DATE));
         //if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
         long l1 = System.currentTimeMillis();
-        Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
+        Integer month = c.get(Calendar.MONTH); //第一个月从0开始，所以得到月份＋1
         //当月最后一天
         logger.info("-----------公司级—月度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeStatementCompany(2022,2,3);
+        statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
         logger.info("------------公司级—月度报表（结束）------------------");
         logger.info("-----------部门级—月度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeStatementOffice(2022,2,3);
+        statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
         logger.info("------------部门级—月度报表（结束）------------------");
-        logger.info("------------公司级—年度报表（开始)------------------");
-        statementCompanyComprehensiveService.disposeStatementCompanyByYear(2022,0,3);
+        /*logger.info("------------公司级—年度报表（开始)------------------");
+        statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
         logger.info("------------公司级—年度报表（结束）------------------");
         logger.info("-----------部门级—年度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeStatementOfficeByYear(2022,0,3);
-        logger.info("------------部门级—年度报表（结束）------------------");
+        statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
+        logger.info("------------部门级—年度报表（结束）------------------");*/
         logger.info("-----------张静—月度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeReportDataStatementCompany(2022,2,7);
+        statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
         logger.info("------------张静—月度报表（结束）------------------");
         //}
 
         map.put("msgMonth","月度报表处理完成");
 
-        logger.info("-----------公司级—季度报表（开始）------------------");
+        /*logger.info("-----------公司级—季度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementCompany(2022,1,1);
         logger.info("------------公司级—季度报表（结束）------------------");
         logger.info("-----------部门级—季度报表（开始）------------------");
@@ -218,7 +218,7 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         logger.info("------------部门级—年度报表（结束）------------------");
 
         map.put("msgYear","年度报表处理完成");
-
+*/
         long l2 = System.currentTimeMillis();
         map.put("msgdate",(l2-l1));
         return map;

src/main/java/com/jeeplus/modules/sys/entity/Workattachment.java

@@ -34,7 +34,6 @@ public class Workattachment extends DataEntity<Workattachment> {
 	private String projectId;	//项目id
 	private String sort;	//排序
 	private String description;	//文件描述
-	private String id;
 
 	public String getDivIdType() {
 		return divIdType;
@@ -185,13 +184,4 @@ public class Workattachment extends DataEntity<Workattachment> {
 		this.description = description;
 	}
 
-	@Override
-	public String getId() {
-		return id;
-	}
-
-	@Override
-	public void setId(String id) {
-		this.id = id;
-	}
 }

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

@@ -164,15 +164,15 @@ public class WorkCalendarTaskService  {
             logger.info("-----------公司级—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
             logger.info("------------公司级—月度报表（结束）------------------");
-            logger.info("------------公司级—年度报表（开始)------------------");
+            /*logger.info("------------公司级—年度报表（开始)------------------");
             statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
-            logger.info("------------公司级—年度报表（结束）------------------");
+            logger.info("------------公司级—年度报表（结束）------------------");*/
             logger.info("-----------部门级—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
             logger.info("------------部门级—月度报表（结束）------------------");
-            logger.info("-----------部门级—年度报表（开始）------------------");
+            /*logger.info("-----------部门级—年度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
-            logger.info("------------部门级—年度报表（结束）------------------");
+            logger.info("------------部门级—年度报表（结束）------------------");*/
             logger.info("-----------张静—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
             logger.info("------------张静—月度报表（结束）------------------");
@@ -185,7 +185,7 @@ public class WorkCalendarTaskService  {
      * 季度报表
      */
     //每个季度最后一天晚上23点推送
-    @Scheduled(cron= "0 0 23 28-31 3,6,9,12 ?")
+    @Scheduled(cron= "0 10 23 28-31 3,6,9,12 ?")
     //@Scheduled(cron= "0 0/2 * * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnQuarter() {
@@ -208,7 +208,7 @@ public class WorkCalendarTaskService  {
      * 年度报表
      */
     //每年最后一天晚上23点推送
-    @Scheduled(cron= "0 0 23 31 12 ?")
+    @Scheduled(cron= "0 20 23 31 12 ?")
     //@Scheduled(cron= "0 0/2 * * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnYear() {