考勤汇导出功能调整，汇总时默认周六周日不汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java

@@ -154,6 +154,12 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
                 now.add(Calendar.DAY_OF_MONTH, -1); //默认查最近30天数据
                 query.setSummaryTime(DateUtils.getStrDate(now.getTime()));
             }
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(DateUtils.StrToDate(query.getSummaryTime()));
+            int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
+            if(dayOfWeek==Calendar.SATURDAY||dayOfWeek==Calendar.SUNDAY){
+                return;
+            }
             log.info("开始汇总[" + query.getSummaryTime() + "]考勤.....");
             //汇总当前日期假期余额
             List<VacationBalanceSummaryVo> vacationBalanceSummaryVoList = attendanceSummaryDao.getVacationBalanceSummary(query);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java

@@ -5,6 +5,8 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICacheService;
+import com.mortals.framework.utils.ReflectUtils;
+import com.mortals.framework.utils.poi.ExcelUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.attendance.model.AttendanceClassQuery;
@@ -176,4 +178,31 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
 
         return pageInfo;
     }
+
+    @PostMapping({"exportExcelExt"})
+    @UnAuth
+    public void exportExcel(@RequestBody AttendanceSummaryQuery query) {
+        Context context = this.getContext();
+        String busiDesc = "导出" + this.getModuleDesc();
+        ArrayList properties = new ArrayList();
+
+        try {
+            String name = StringUtils.trim(this.moduleDesc);
+            if (StringUtils.isEmpty(name)) {
+                name = System.currentTimeMillis() + "";
+            }
+            String fileName = name + ".xlsx";
+            PageInfo pageInfo = new PageInfo(-1);
+            List<AttendanceStatEntity> list = this.getService().findExt(query, pageInfo, context).getList();
+            Class<AttendanceStatEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);
+            ExcelUtil<AttendanceStatEntity, Long> util = new ExcelUtil(tClass);
+            this.doExportAfter(context, list);
+            byte[] data = util.exportExcel(list, properties, name);
+            this.responseStream(this.response, data, fileName);
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var12) {
+            this.doException(this.request, "导出异常", new HashMap(), var12);
+        }
+
+    }
 }