精简模式导出日报

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -6563,18 +6563,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     titles.add(MessageUtils.message("excel.auditTime"));
                     titles.add(MessageUtils.message("excel.auditProcess"));
                 }else {
-                    titles.add(MessageUtils.message("excel.fillTime"));
                     titles.add("项目经理");
                 }
 
 
 //                logDetails = reportLogDetailMapper.selectList(new QueryWrapper<ReportLogDetail>().select("report_id, msg, operator_id, operate_date").eq("company_id", company.getId()).between("work_date", startDate, endDate));
             }
-            if (exportType==0) {
+            if (exportType==0 || companyId == 1071) {//物奇需要工作事项
                 //titles.add("工作事项");
                 titles.add(MessageUtils.message("excel.workItems"));
             }
-            if(stateKey==1 || stateKey==0 || stateKey==2){
+            if(exportType==0 && (stateKey==1 || stateKey==0 || stateKey==2)){
                 //titles.add("审核状态");
                 titles.add(MessageUtils.message("excel.auditStatus"));
             }
@@ -6587,7 +6586,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 titles.add(MessageUtils.message("excel.reviewProcessStatus"));
             }
             //新版按周填报增加周总结
-            if (timeType.getEnableNewWeeklyfill() == 1) {
+            if (timeType.getEnableNewWeeklyfill() == 1 && exportType==0) {
                 //titles.add("周总结");
                 titles.add(MessageUtils.message("excel.weekSummary"));
             }
@@ -6960,8 +6959,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     item.add(map.get("stage") != null?map.get("stage").toString():"");
                 }
                 if (timeType.getShowFillauditTime() == 1) {
-                    item.add(sdf.format((Date)map.get("time")));
                     if (exportType==0){
+                        item.add(sdf.format((Date)map.get("time")));
                         if(needCorpWxTranslate){
                             String projectAuditorName ="$userName="+String.valueOf(map.get("projectAuditorCorpwxUserId"))+"$";
                             item.add(projectAuditorName);
@@ -7092,10 +7091,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         item.add(sb.toString());
                     }
                 }
-                if (exportType==0) {
+                if (exportType==0 || companyId == 1071) {
                     item.add((String) map.get("content"));
                 }
-                if(stateKey==1 || stateKey ==0 || stateKey==2){
+                if(exportType==0 && (stateKey==1 || stateKey ==0 || stateKey==2)){
                     Integer state = (Integer) map.get("state");
                     switch (state){
                         //case 0:row.createCell(index).setCellValue("待审核");
@@ -7255,7 +7254,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                 }
 
-                if (timeType.getEnableNewWeeklyfill() == 1) {
+                if (timeType.getEnableNewWeeklyfill() == 1 && exportType==0) {
                     ReportBatch batchItem = reportBatchMapper.selectOne(new QueryWrapper<ReportBatch>().eq("creator_id", map.get("creatorId")).eq("start_date", createDate).last("limit 1"));
                     if (batchItem != null) {
                         item.add(batchItem.getSummary());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -1433,7 +1433,7 @@ public class TimingTask {
 
     //每分钟校验是否有需要提醒的填报
     @Scheduled(fixedRate = 60 * 1000)
-    private void process() {
+    private void pushMissReportAlert() {
         if (isDev) {
             return;
         }
@@ -1449,7 +1449,9 @@ public class TimingTask {
             if (str.equals(t.getAlertTime())) {
                 //节假日是否提醒
                 Boolean workDay = timeTypeService.isWorkDay(t.getCompanyId(), localDate, t, null);
-                if ((t.getAlertType() == 0 || t.getAlertType() == 1) && !workDay){
+                LocalDate yesterday = localDate.minusDays(1);
+                boolean isYesterdayWorkDay = timeTypeService.isWorkDay(t.getCompanyId(), yesterday, t, null);
+                if ((t.getAlertType() == 0 && !workDay) ||(t.getAlertType() == 1 && !isYesterdayWorkDay)){
                     return;
                 }
                 //每周几提醒上周的情况下，需要校验当前是周几