报表回滚

src/main/java/com/jeeplus/modules/statement/service/StatementCompanyComprehensiveService.java

@@ -178,14 +178,12 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
      * @param bigDateType 状态1（0：年；1：季度；2：月份）
      * @param smallDateType 状态2（针对状态1进行精确所在指定季度或者月份）
      */
-    public void disposeStatementCompany(Integer year,Integer bigDateType,Integer smallDateType){
+    public void disposeStatementCompany(Integer bigDateType,Integer smallDateType){
         Calendar cal = Calendar.getInstance();
         //获取当前年份
-        if (null == year){
-            year = cal.get(Calendar.YEAR);
-        }
+        int year = cal.get(Calendar.YEAR);
 
-        Map<String, String> dateMap = getDateNew(bigDateType, smallDateType,year);
+        Map<String, String> dateMap = getDate(bigDateType, smallDateType);
         //开始时间
         String beginDate = dateMap.get("beginDate");
         //结束时间

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

@@ -147,7 +147,7 @@ public class WorkCalendarTaskService  {
      */
     //每个月最后一天晚上23点推送
     //@Scheduled(cron= "0 0 23 28-31 * ?")
-    //@Scheduled(cron= "0 0/1 * * * ?")
+    //@Scheduled(cron= "0 0/2 * * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnMonth() {
         final Calendar c = Calendar.getInstance();
@@ -158,7 +158,7 @@ public class WorkCalendarTaskService  {
             Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
             //当月最后一天
             logger.info("-----------公司级—月度报表（开始）------------------");
-            statementCompanyComprehensiveService.disposeStatementCompany(2021,2,12);
+            statementCompanyComprehensiveService.disposeStatementCompany(2,month);
             logger.info("------------公司级—月度报表（结束）------------------");
             logger.info("-----------部门级—月度报表（开始）------------------");
             //statementCompanyComprehensiveService.disposeStatementOffice(2,month);
@@ -172,21 +172,20 @@ public class WorkCalendarTaskService  {
      */
     //每个季度最后一天晚上23点推送
     //@Scheduled(cron= "0 0 23 28-31 3,6,9,12 ?")
-    //@Scheduled(cron= "0 0/1 * * * ?")
-    @Transactional(readOnly = false)
+    //@Scheduled(cron= "0 0/2 * * * ?")
     public void getStatementCompanyComprehensiveOnQuarter() {
         final Calendar c = Calendar.getInstance();
         Integer month = c.get(Calendar.MONTH)+3; //第一个月从0开始，所以得到月份＋1
         Integer quarter = month/3;
-        //if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
+        if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
             //当月最后一天
             logger.info("-----------公司级—季度报表（开始）------------------");
-            statementCompanyComprehensiveService.disposeStatementCompany(2021,1,4);
+            statementCompanyComprehensiveService.disposeStatementCompany(1,quarter);
             logger.info("------------公司级—季度报表（结束）------------------");
             logger.info("-----------部门级—季度报表（开始）------------------");
             //projectRecordsService.saveProjectRecordListByAdvent();
             logger.info("------------部门级—季度报表（结束）------------------");
-        //}
+        }
     }
 
     /**
@@ -194,11 +193,9 @@ public class WorkCalendarTaskService  {
      */
     //每年最后一天晚上23点推送
     //@Scheduled(cron= "0 0 23 31 12 ?")
-    //@Scheduled(cron= "0 0/1 * * * ?")
-    @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnYear() {
         logger.info("-----------公司级—年度报表（开始）------------------");
-        statementCompanyComprehensiveService.disposeStatementCompany(2021,0,0);
+        statementCompanyComprehensiveService.disposeStatementCompany(0,0);
         logger.info("------------公司级—年度报表（结束）------------------");
         logger.info("-----------部门级—年度报表（开始）------------------");
         //projectRecordsService.saveProjectRecordListByAdvent();