diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java index 474513f..cc8c7e6 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java @@ -261,5 +261,5 @@ public interface AttSourceDataDao { */ List getNotFullAtt(String today); - int updateMonthReportFullAtt(@Param("list") List list, @Param("month") int month); + int updateMonthReportFullAtt(@Param("list") List list, @Param("month") String month); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java index bbc0c16..4e2cc6e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java @@ -156,5 +156,5 @@ public interface AttCalService { * @param list * @param month */ - int updateMonthReportFullAtt(List list,int month); + int updateMonthReportFullAtt(List list,String month); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java index b56832d..30481b6 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java @@ -542,7 +542,7 @@ public class AttCalServiceImpl implements AttCalService { * @return */ @Override - public int updateMonthReportFullAtt(List list,int month) { + public int updateMonthReportFullAtt(List list,String month) { return attSourceDataDao.updateMonthReportFullAtt(list,month); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/NewAttTask.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/NewAttTask.java index b4ecd9b..abe1868 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/NewAttTask.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/NewAttTask.java @@ -181,11 +181,11 @@ public class NewAttTask { @Async public void getMonthReportFullAttTask() { log.info("--------月报表--是否全勤定时器开启------"); - String today = DateUtil.today(); +// String today = DateUtil.today(); + String today = "2025-08-04"; List list = attCalService.getNotFullAtt(today); if(!list.isEmpty()){ - Date now = new Date(); // 当前日期时间 - int month = DateUtil.month(now) + 1; + String month = today.substring(0,7); attCalService.updateMonthReportFullAtt(list,month); } log.info("--------月报表--是否全勤定时器完毕------"); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java index 2eac83c..5f30d01 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java @@ -764,7 +764,8 @@ public class ExportFileController { map.put("培训天数", attDayReportList.get(i).getTrainNum()); map.put("外勤天数", attDayReportList.get(i).getOutsideAttNum()); map.put("考勤天数备注", attDayReportList.get(i).getRequiredDayRemark()); - map.put("是否全勤", attDayReportList.get(i).getIsFullAtt()==1?"是":"否"); + double isFullAtt = attDayReportList.get(i).getLateNum() + attDayReportList.get(i).getLateNum() + attDayReportList.get(i).getSkippingNum(); + map.put("是否全勤", attDayReportList.get(i).getIsFullAtt()==1?(isFullAtt>0?"否":"是"):"否"); departmentData1.add(map); } exporter.addDataRows(departmentSheet1, departmentData1, departmentHeaders1); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/entity/EvectionBean.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/entity/EvectionBean.java index 81fd14f..b29073d 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/entity/EvectionBean.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/entity/EvectionBean.java @@ -206,4 +206,7 @@ public class EvectionBean extends BaseBean { private String isActive; + /**是否因公*/ + private String isBusiness; + }