bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加全勤

This commit is contained in:
方亮 2025-08-06 15:22:36 +08:00
parent 43a67fd17a
commit 0dbe176718
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/dao/AttSourceDataDao.java
View File

@ -261,5 +261,5 @@ public interface AttSourceDataDao {
*/ */
List<String> getNotFullAtt(String today); List<String> getNotFullAtt(String today);
int updateMonthReportFullAtt(@Param("list") List<String> list, @Param("month") int month); int updateMonthReportFullAtt(@Param("list") List<String> list, @Param("month") String month);
} }

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalService.java
View File

@ -156,5 +156,5 @@ public interface AttCalService {
* @param list * @param list
* @param month * @param month
*/ */
int updateMonthReportFullAtt(List<String> list,int month); int updateMonthReportFullAtt(List<String> list,String month);
} }

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttCalServiceImpl.java
View File

@ -542,7 +542,7 @@ public class AttCalServiceImpl implements AttCalService {
* @return * @return
*/ */
@Override @Override
public int updateMonthReportFullAtt(List<String> list,int month) { public int updateMonthReportFullAtt(List<String> list,String month) {
return attSourceDataDao.updateMonthReportFullAtt(list,month); return attSourceDataDao.updateMonthReportFullAtt(list,month);
} }

6
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/NewAttTask.java
View File

@ -181,11 +181,11 @@ public class NewAttTask {
@Async @Async
public void getMonthReportFullAttTask() { public void getMonthReportFullAttTask() {
log.info("--------月报表--是否全勤定时器开启------"); log.info("--------月报表--是否全勤定时器开启------");
String today = DateUtil.today(); // String today = DateUtil.today();
String today = "2025-08-04";
List<String> list = attCalService.getNotFullAtt(today); List<String> list = attCalService.getNotFullAtt(today);
if(!list.isEmpty()){ if(!list.isEmpty()){
Date now = new Date(); // 当前日期时间 String month = today.substring(0,7);
int month = DateUtil.month(now) + 1;
attCalService.updateMonthReportFullAtt(list,month); attCalService.updateMonthReportFullAtt(list,month);
} }
log.info("--------月报表--是否全勤定时器完毕------"); log.info("--------月报表--是否全勤定时器完毕------");

3
bonus-modules/bonus-system/src/main/java/com/bonus/system/download/ExportFileController.java
View File

@ -764,7 +764,8 @@ public class ExportFileController {
map.put("培训天数", attDayReportList.get(i).getTrainNum()); map.put("培训天数", attDayReportList.get(i).getTrainNum());
map.put("外勤天数", attDayReportList.get(i).getOutsideAttNum()); map.put("外勤天数", attDayReportList.get(i).getOutsideAttNum());
map.put("考勤天数备注", attDayReportList.get(i).getRequiredDayRemark()); 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); departmentData1.add(map);
} }
exporter.addDataRows(departmentSheet1, departmentData1, departmentHeaders1); exporter.addDataRows(departmentSheet1, departmentData1, departmentHeaders1);

3
bonus-modules/bonus-system/src/main/java/com/bonus/system/evection/entity/EvectionBean.java
View File

@ -206,4 +206,7 @@ public class EvectionBean extends BaseBean {
private String isActive; private String isActive;
/**是否因公*/
private String isBusiness;
} }