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

导出修改

This commit is contained in:
fl 2025-01-07 02:05:52 +08:00
parent 69e2b67226
commit 66a6f755dc
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttDetailByMonthController.java
View File

@ -170,11 +170,19 @@ public class AttDetailByMonthController extends BaseController {
AttDetailBean dayTable = new AttDetailBean();
dayTable.setStartDate(monthFirstAndLast.get(0));
dayTable.setEndDate(monthFirstAndLast.get(1));
if(bean.getOrgId() != null){
dayTable.setOrgId(String.valueOf(bean.getOrgId()));
}
dayTable.setName(bean.getName());
headers.entrySet()
.forEach(entry -> {
if("99".equals(entry.getKey())){
AttDataDetailsBean att = new AttDataDetailsBean();
att.setAttCurrentMonth(bean.getAttCurrentMonth());
if(bean.getOrgId() != null){
att.setOrgId(Long.valueOf(bean.getOrgId()));
}
att.setUserName(bean.getName());
List<AttDataDetailsBean> list = attendanceDetailsService.getOutCountList(att);
Sheet departmentSheet2 = exporter.createSheet(entry.getValue());
List<String> departmentHeaders2 = Arrays.asList("序号", "考勤日期", "姓名", "所属部门", "打卡时间", "打卡地址");

17
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/service/AttendanceDetailsServiceImpl.java
View File

@ -9,12 +9,15 @@ import com.bonus.system.api.domain.SysUser;
import com.bonus.system.att.dao.AttendanceDetailsDao;
import com.bonus.system.att.entity.AttDataDetailsBean;
import com.bonus.system.att.entity.AttDayReportBean;
import com.bonus.system.att.entity.AttGroupBean;
import com.bonus.system.att.entity.AttMonthReportBean;
import com.bonus.system.att.tasks.AttTasks;
import com.bonus.system.att.tasks.WechatTasks;
import com.bonus.system.basic.domain.SysNotice;
import com.bonus.system.basic.service.SysNoticeService;
import com.bonus.system.dept.dao.ProDeptRoleDao;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -106,7 +109,19 @@ public class AttendanceDetailsServiceImpl implements AttendanceDetailsService {
c.setReviewerUserId(userId);
c.setReviewerTime(time);
});
return attendanceDetailsDao.updateAttDetailsDataExamine(list);
int i = attendanceDetailsDao.updateAttDetailsDataExamine(list);
if(i>0){
Set<String> keys = new HashSet<>();
for (AttDataDetailsBean attDataDetailsBean : list) {
keys.add(attDataDetailsBean.getAttCurrentDay());
}
// 使用增强的 for 循环遍历 Set
for (String item : keys) {
List<AttGroupBean> groupList = attTasks.getGroupData(item, 2);
attTasks.createReportData(groupList, item, 2);
}
}
return i;
}
@Override

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

@ -596,11 +596,15 @@ public class ExportFileController {
AttDetailBean dayTable = new AttDetailBean();
dayTable.setStartDate(monthFirstAndLast.get(0));
dayTable.setEndDate(monthFirstAndLast.get(1));
dayTable.setOrgId(String.valueOf(bean.getOrgId()));
dayTable.setName(bean.getUserName());
headers.entrySet()
.forEach(entry -> {
if("99".equals(entry.getKey())){
AttDataDetailsBean att = new AttDataDetailsBean();
att.setAttCurrentMonth(bean.getMonth());
att.setOrgId(bean.getOrgId());
att.setUserName(bean.getUserName());
List<AttDataDetailsBean> list = attendanceDetailsService.getOutCountList(att);
Sheet departmentSheet2 = exporter.createSheet(entry.getValue());
List<String> departmentHeaders2 = Arrays.asList("序号", "考勤日期", "姓名", "所属部门", "打卡时间", "打卡地址");