diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java index 1f1c29f7064e24e0720ceb47e94929e2c457da8c..ea9298382e8ff82f01b26b5abd964235cdb2a3b9 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java @@ -293,6 +293,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc attendanceStatEntity.setCreateTime(new Date()); attendanceStatEntity.setCreateUserId(1l); attendanceStatEntity.setGoTimes(1); //榛樿褰撳ぉ鍏ㄥ嫟 + attendanceStatEntity.setGoWorks(1); //榛樿褰撳ぉ鍏ㄥ嫟 //this.dao.insert(attendanceStatEntity); insertList.add(attendanceStatEntity); } else { @@ -312,6 +313,7 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc attendanceStatEntity.setMonth(item.getMonth()); attendanceStatEntity.setDay(item.getDay()); attendanceStatEntity.setGoTimes(1); //榛樿褰撳ぉ鍏ㄥ嫟 + attendanceStatEntity.setGoWorks(1); //榛樿褰撳ぉ鍏ㄥ嫟 attendanceStatEntity.setId(temp.getId()); attendanceStatEntity.setUpdateTime(new Date()); updateList.add(attendanceStatEntity); diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java index b12101b378cf02173bb4a081f0aa503ed68cdd01..1539ec97d4ee5031eafe92d433ad8080c4e3133c 100644 --- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java +++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java @@ -273,7 +273,7 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController< }).collect(Collectors.toList()); // byte[] data = util.exportExcel(list, properties, name); - byte[] data = util.exportExcel(list, properties, lists, name,6); + byte[] data = util.exportExcel(list, properties, lists, name,12); this.responseStream(this.response, data, fileName); this.recordSysLog(this.request, busiDesc + " 銆愭垚鍔熴€�"); } catch (Exception var12) {