From 31e12935f839f0751b8a0625530a71f07f9fccd3 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Sat, 12 Apr 2025 19:33:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(smartfactory):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B7=A5=E8=B5=84=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=98=E5=B7=A5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增工资统计相关接口和页面 - 添加薪资主体明细相关功能 - 优化员工信息展示和查询 - 调整工厂名称显示为简称 --- .../StaffAttendanceRecordController.java | 132 +--------------- ...ngGroupAmountSpecificationsController.java | 25 ++- ...ndlingGroupAmountSpecificationsRespVO.java | 3 + .../admin/staff/StaffController.java | 8 + .../admin/staff/vo/StaffRespVO.java | 12 ++ .../admin/staff/vo/StaffSalaryUpdateVO.java | 20 +++ .../admin/staff/vo/StaffSaveReqVO.java | 12 ++ .../staffsalary/StaffSalaryController.java | 9 ++ .../staffsalary/vo/SalarySubjectItemsVO.java | 17 ++ .../admin/staffsalary/vo/SalaryTotalVO.java | 18 +++ .../staffsalary/vo/StaffSalaryRespVO.java | 3 + .../staffsalary/vo/StaffSalarySaveReqVO.java | 3 + .../dal/dataobject/staff/StaffDO.java | 20 +++ .../dataobject/staffsalary/StaffSalaryDO.java | 6 + .../dal/mysql/staff/StaffMapper.java | 2 +- .../mysql/staffsalary/StaffSalaryMapper.java | 10 +- .../StaffAttendanceRecordService.java | 5 + .../StaffAttendanceRecordServiceImpl.java | 146 +++++++++++++++++- .../service/staff/StaffService.java | 11 +- .../service/staff/StaffServiceImpl.java | 17 +- .../staffsalary/StaffSalaryService.java | 8 + .../staffsalary/StaffSalaryServiceImpl.java | 64 ++++++-- .../mapper/staffsalary/StaffSalaryMapper.xml | 55 +++++++ 23 files changed, 451 insertions(+), 155 deletions(-) create mode 100644 zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffSalaryUpdateVO.java create mode 100644 zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/SalarySubjectItemsVO.java create mode 100644 zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/SalaryTotalVO.java create mode 100644 zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staffsalary/StaffSalaryMapper.xml diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/attendance/StaffAttendanceRecordController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/attendance/StaffAttendanceRecordController.java index 18c80bc7..4267ba1c 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/attendance/StaffAttendanceRecordController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/attendance/StaffAttendanceRecordController.java @@ -26,9 +26,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -154,7 +154,7 @@ public class StaffAttendanceRecordController { Map staffMap = convertMap(staffDOS, StaffDO::getId); if (CollUtil.isNotEmpty(recordDOS)) { - List recordRespVO = convertRecord(reqVO, recordDOS, otherRecordDOS); + List recordRespVO = staffAttendanceRecordService.convertRecord(reqVO, recordDOS, otherRecordDOS); // 筛选掉已经存在的员工 List staffIds = staffDOS.stream() @@ -215,128 +215,6 @@ public class StaffAttendanceRecordController { } } - private List convertRecord(StaffAttendanceRecordReqVO reqVO, - List recordDOS, - List otherRecordDOS) { - - // 根据考勤类型 生成对应得日期数据 - List punchTimeList = new ArrayList<>(); - - // 获取所选月份的第一天 - LocalDate now = LocalDate.parse(reqVO.getMonth() + "-01", DateTimeFormatter.ISO_LOCAL_DATE); - if (reqVO.getType() == 1) { - - // 获取上月26日日期 - LocalDate beginDate = now.minusMonths(1).withDayOfMonth(26); - // 本月25日日期 - LocalDate lastMonthEnd = now.withDayOfMonth(25); - - while (!beginDate.isAfter(lastMonthEnd)) { - AttendanceRecordVO attendanceRecordVO = new AttendanceRecordVO() - .setPunchTime(beginDate); - punchTimeList.add(attendanceRecordVO); - - beginDate = beginDate.plusDays(1); - } - } - if (reqVO.getType() == 2) { - // 获取所选月份的第一天 - LocalDate firstDayOfMonth = LocalDate.parse(reqVO.getMonth() + "-01", DateTimeFormatter.ISO_LOCAL_DATE); - - // 生成当月每一天的 LocalDate - for (int i = 0; i < firstDayOfMonth.lengthOfMonth(); i++) { - AttendanceRecordVO attendanceRecordVO = new AttendanceRecordVO() - .setPunchTime(firstDayOfMonth.plusDays(i)); - punchTimeList.add(attendanceRecordVO); - } - } - // 获取员工信息 - List staffDOS = staffService.getList(convertSet(recordDOS, StaffAttendanceRecordDO::getStaffId)); - Map staffMap = convertMap(staffDOS, StaffDO::getId); - - // 获取厂区信息 - Set factoryIds = convertSet(recordDOS, StaffAttendanceRecordDO::getFactoryId); - factoryIds.addAll(convertList(otherRecordDOS, StaffAttendanceRecordDO::getFactoryId)); - List factoryDOS = factoryInfoService.getFactoryList(factoryIds); - Map factoryMap = convertMap(factoryDOS, FactoryInfoDO::getId); - - // 根据用户 分组打卡记录 - Map> recordMap = convertMultiMap(recordDOS, StaffAttendanceRecordDO::getStaffId); - - // 重组数据 - List respVOs = new ArrayList<>(); - for (Map.Entry> entry : recordMap.entrySet()) { - - if (!staffMap.containsKey(entry.getKey())) { - continue; - } - - // 设置所选厂区 员工得考勤信息 - StaffAttendanceRecordRespVO respVO = new StaffAttendanceRecordRespVO( - entry.getKey(), - reqVO.getFactoryId(), - reqVO.getType(), - reqVO.getMonth()); - - Map records = entry.getValue().stream() - .filter(record -> record.getFactoryId().equals(reqVO.getFactoryId())) // 筛选同一个工厂打卡数据 - .map(item -> BeanUtils.toBean(item, AttendanceRecordVO.class)) - .collect(Collectors.toMap(AttendanceRecordVO::getPunchTime, value -> value)); - // 设置打卡数据 - respVO.setRecords(punchTimeList.stream() - .peek(record -> { - if (records.containsKey(record.getPunchTime())) { - record.setStatus(records.get(record.getPunchTime()).getStatus()); - }}) - .collect(Collectors.toList())); - // 设置员工名称 - respVO.setStaffName(staffMap.get(entry.getKey()).getNickName()); - // 设置工种 - respVO.setWorkTypeId(staffMap.get(entry.getKey()).getWorkTypeId()); - // 设置厂区名称 - respVO.setFactoryName(factoryMap.get(reqVO.getFactoryId()) != null ? factoryMap.get(reqVO.getFactoryId()).getName() : null); - - if (CollUtil.isNotEmpty(otherRecordDOS)) { - // 获得该员工 在其他工厂的考勤记录 - Map> factoryRecordMap = convertMultiMap(otherRecordDOS, StaffAttendanceRecordDO::getFactoryId); - - List childRespVO = otherRecordDOS.stream() - .map(recordDO -> new StaffAttendanceRecordRespVO( - recordDO.getStaffId(), - recordDO.getFactoryId(), - recordDO.getType(), - recordDO.getMonth())) - .distinct() - .collect(Collectors.toList()); - - childRespVO.forEach(vo -> { - if (!staffMap.containsKey(vo.getStaffId())) { - return; - } - // 设置员工名称 - vo.setStaffName(staffMap.get(vo.getStaffId()).getNickName()); - // 设置工种 - vo.setWorkTypeId(staffMap.get(vo.getStaffId()).getWorkTypeId()); - // 设置厂区名称 - vo.setFactoryName(factoryMap.get(vo.getFactoryId()) != null ? factoryMap.get(vo.getFactoryId()).getName() : null); - - if (factoryRecordMap.containsKey(vo.getFactoryId())) { - - // 设置打卡记录 - vo.setRecords(BeanUtils.toBean(factoryRecordMap.get(vo.getFactoryId()), AttendanceRecordVO.class)); - } - }); - // 插入其他考勤记录 - respVO.setChildRecords(childRespVO); - } - - // 插入集合 - respVOs.add(respVO); - } - - return respVOs; - } - @GetMapping("/export-excel") @Operation(summary = "导出厂区员工考勤记录 Excel") @PreAuthorize("@ss.hasPermission('smartfactory:staff-attendance-record:export')") @@ -347,7 +225,7 @@ public class StaffAttendanceRecordController { List recordDOS = staffAttendanceRecordService.getStaffAttendanceRecordList(reqVO); // 导出 Excel ExcelUtils.write(response, "厂区员工考勤记录.xls", "数据", StaffAttendanceRecordRespVO.class, - convertRecord(reqVO, recordDOS, null)); + staffAttendanceRecordService.convertRecord(reqVO, recordDOS, null)); } @PutMapping("/review") diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/handlinggroupamountspecifications/HandlingGroupAmountSpecificationsController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/handlinggroupamountspecifications/HandlingGroupAmountSpecificationsController.java index 502339ac..8dd8880e 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/handlinggroupamountspecifications/HandlingGroupAmountSpecificationsController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/handlinggroupamountspecifications/HandlingGroupAmountSpecificationsController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.smartfactory.controller.admin.handlinggroupamountspecifications; +import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -12,6 +13,8 @@ import cn.iocoder.yudao.module.smartfactory.controller.admin.handlinggroupamount import cn.iocoder.yudao.module.smartfactory.controller.admin.handlinggroupamountspecifications.vo.HandlingGroupAmountSpecificationsSaveReqVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.handlinggroupamountspecifications.HandlingGroupAmountSpecificationsDO; import cn.iocoder.yudao.module.smartfactory.service.handlinggroupamountspecifications.HandlingGroupAmountSpecificationsService; +import cn.iocoder.yudao.module.system.api.dept.DeptApi; +import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -24,8 +27,12 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.util.List; +import java.util.Map; +import java.util.Set; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 搬运组工资规格关联") @@ -37,6 +44,9 @@ public class HandlingGroupAmountSpecificationsController { @Resource private HandlingGroupAmountSpecificationsService handlingGroupAmountSpecificationsService; + @Resource + private DeptApi deptApi; + @PostMapping("/batchCreate") @Operation(summary = "创建搬运组工资规格关联") @PreAuthorize("@ss.hasPermission('smartfactory:handling-group-amount-specifications:create')") @@ -77,7 +87,20 @@ public class HandlingGroupAmountSpecificationsController { @PreAuthorize("@ss.hasPermission('smartfactory:handling-group-amount-specifications:query')") public CommonResult> getHandlingGroupAmountSpecificationsPage(@Valid HandlingGroupAmountSpecificationsPageReqVO pageReqVO) { PageResult pageResult = handlingGroupAmountSpecificationsService.getHandlingGroupAmountSpecificationsPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, HandlingGroupAmountSpecificationsRespVO.class)); + PageResult result = BeanUtils.toBean(pageResult, HandlingGroupAmountSpecificationsRespVO.class); + if (CollUtil.isNotEmpty(result.getList())) { + + // 获取工厂信息 + Set factoryIds = convertSet(result.getList(), HandlingGroupAmountSpecificationsRespVO::getFactoryId); + Map factoryMap = convertMap(deptApi.getDeptList(factoryIds).getCheckedData(), DeptRespDTO::getId); + + result.getList().forEach(data -> { + // 设置工厂名称 + data.setFactoryName(factoryMap.get(data.getFactoryId()) != null ? factoryMap.get(data.getFactoryId()).getName() : null); + }); + } + + return success(result); } @GetMapping("/export-excel") diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/handlinggroupamountspecifications/vo/HandlingGroupAmountSpecificationsRespVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/handlinggroupamountspecifications/vo/HandlingGroupAmountSpecificationsRespVO.java index 55db8b15..2fcde91f 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/handlinggroupamountspecifications/vo/HandlingGroupAmountSpecificationsRespVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/handlinggroupamountspecifications/vo/HandlingGroupAmountSpecificationsRespVO.java @@ -20,6 +20,9 @@ public class HandlingGroupAmountSpecificationsRespVO { @Schema(description = "工厂id", example = "23178") private Long factoryId; + @Schema(description = "工厂名称", example = "23178") + private String factoryName; + @Schema(description = "搬运规格id", example = "23178") @ExcelProperty("搬运规格id") private Long handlingSpecificationsId; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java index 157d42f7..6f6d742c 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/StaffController.java @@ -74,6 +74,14 @@ public class StaffController { return success(true); } + @PutMapping("/update-salary") + @Operation(summary = "更新员工") + @PreAuthorize("@ss.hasPermission('factory:staff:update')") + public CommonResult updateStaffSalary(@RequestBody StaffSalaryUpdateVO updateReqVO) { + staffService.updateStaffSalary(updateReqVO); + return success(true); + } + @DeleteMapping("/delete") @Operation(summary = "删除员工") @Parameter(name = "id", description = "编号", required = true) diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffRespVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffRespVO.java index cc1f3e7f..fa9fe680 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffRespVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffRespVO.java @@ -49,9 +49,21 @@ public class StaffRespVO { @ExcelProperty("身份证号") private String idCard; + @Schema(description = "银行卡名称") + private String bankName; + + @Schema(description = "银行卡号") + private String bankNo; + + @Schema(description = "薪资主体 | 字典值 sf_staff_salary_subject") + private Integer salarySubject; + @Schema(description = "0离职 1在职 2工伤") private Integer status; + @Schema(description = "备注") + private String notes; + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffSalaryUpdateVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffSalaryUpdateVO.java new file mode 100644 index 00000000..06a09e91 --- /dev/null +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffSalaryUpdateVO.java @@ -0,0 +1,20 @@ +package cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 员工更新 Request VO") +@Data +public class StaffSalaryUpdateVO { + + @Schema(description = "主键id") + private Long id; + + @Schema(description = "薪资") + private BigDecimal salary; + + @Schema(description = "薪资主体 | 字典值 sf_staff_salary_subject") + private Integer salarySubject; +} diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffSaveReqVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffSaveReqVO.java index a16ce756..df0255a6 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffSaveReqVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staff/vo/StaffSaveReqVO.java @@ -43,9 +43,21 @@ public class StaffSaveReqVO { @IdCard private String idCard; + @Schema(description = "银行卡名称") + private String bankName; + + @Schema(description = "银行卡号") + private String bankNo; + @Schema(description = "薪资") private BigDecimal salary; + @Schema(description = "薪资主体 | 字典值 sf_staff_salary_subject") + private Integer salarySubject; + + @Schema(description = "备注") + private String notes; + @Schema(description = "0离职 1在职 2工伤") private Integer status; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/StaffSalaryController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/StaffSalaryController.java index 05344bd3..d3627c2c 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/StaffSalaryController.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/StaffSalaryController.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; +import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.SalaryTotalVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalaryPageReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalaryRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalarySaveReqVO; @@ -86,6 +87,14 @@ public class StaffSalaryController { return success(pageResult); } + @GetMapping("/total") + @Operation(summary = "获取工资统计") + @PreAuthorize("@ss.hasPermission('smartfactory:staff-salary:query')") + public CommonResult getStaffSalaryTotal(@Valid StaffSalaryPageReqVO pageReqVO) { + + return success(staffSalaryService.getStaffSalaryTotal(pageReqVO)); + } + @GetMapping("/export-excel") @Operation(summary = "导出厂区员工工资 Excel") @PreAuthorize("@ss.hasPermission('smartfactory:staff-salary:export')") diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/SalarySubjectItemsVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/SalarySubjectItemsVO.java new file mode 100644 index 00000000..123a6a02 --- /dev/null +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/SalarySubjectItemsVO.java @@ -0,0 +1,17 @@ +package cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 薪资主体明细 Response VO") +@Data +public class SalarySubjectItemsVO { + + @Schema(description = "薪资主体编号") + private Integer salarySubjectId; + + @Schema(description = "金额") + private BigDecimal amount; +} diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/SalaryTotalVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/SalaryTotalVO.java new file mode 100644 index 00000000..5e5fc86b --- /dev/null +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/SalaryTotalVO.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Schema(description = "管理后台 - 薪资统计信息 Response VO") +@Data +public class SalaryTotalVO { + + @Schema(description = "实发金额总计") + private BigDecimal realAmountTotal; + + @Schema(description = "薪资主体明细总计") + private List salarySubjectItems; +} diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/StaffSalaryRespVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/StaffSalaryRespVO.java index e303bd5c..8d2c1083 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/StaffSalaryRespVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/StaffSalaryRespVO.java @@ -66,6 +66,9 @@ public class StaffSalaryRespVO { @Schema(description = "扣款明细") private List deductionItems; + @Schema(description = "薪资主体明细") + private List salarySubjectItems; + @Schema(description = "复核状态 | 0未复核 1已复核") private Integer status; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/StaffSalarySaveReqVO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/StaffSalarySaveReqVO.java index b089ef91..e203cdec 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/StaffSalarySaveReqVO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/staffsalary/vo/StaffSalarySaveReqVO.java @@ -45,6 +45,9 @@ public class StaffSalarySaveReqVO { @Schema(description = "扣款明细") private List deductionItems; + @Schema(description = "薪资主体明细") + private List salarySubjectItems; + @Schema(description = "复核状态 | 0未复核 1已复核", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "0") private Integer status; diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/staff/StaffDO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/staff/StaffDO.java index 95f9f8ab..384161a7 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/staff/StaffDO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/staff/StaffDO.java @@ -68,11 +68,31 @@ public class StaffDO extends BaseDO { */ private String idCard; + /** + * 银行名称 + */ + private String bankName; + + /** + * 银行卡号 + */ + private String bankNo; + /** * 工资 */ private BigDecimal salary; + /** + * 薪资主体 | 字典值 sf_staff_salary_subject + */ + private Integer salarySubject; + + /** + * 备注 + */ + private String notes; + /** * 0离职 1在职 2工伤 */ diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/staffsalary/StaffSalaryDO.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/staffsalary/StaffSalaryDO.java index 6b0d1811..27ee2310 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/staffsalary/StaffSalaryDO.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/staffsalary/StaffSalaryDO.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.smartfactory.dal.dataobject.staffsalary; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.DeductionItemsVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.SalarySubjectItemsVO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -69,6 +70,11 @@ public class StaffSalaryDO extends BaseDO { */ @TableField(typeHandler = JacksonTypeHandler.class) private List deductionItems; + /** + * 薪资主体明细 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private List salarySubjectItems; /** * 复核状态 | 0未复核 1已复核 */ diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/staff/StaffMapper.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/staff/StaffMapper.java index 2457757c..8a98ba60 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/staff/StaffMapper.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/staff/StaffMapper.java @@ -54,7 +54,7 @@ public interface StaffMapper extends BaseMapperX { .selectAs(StaffDO::getId, StaffSalaryRespVO::getStaffId) .selectAs(StaffDO::getNickName, StaffSalaryRespVO::getStaffName) .selectAs(StaffDO::getFactoryId, StaffSalaryRespVO::getFactoryId) - .selectAs(FactoryInfoDO::getName, StaffSalaryRespVO::getFactoryName) + .selectAs(FactoryInfoDO::getShortName, StaffSalaryRespVO::getFactoryName) .selectAs(StaffDO::getWorkTypeId, StaffSalaryRespVO::getWorkTypeId) .selectAs(StaffSalaryDO::getMonth, StaffSalaryRespVO::getMonth) .selectAs(StaffDO::getSalary, StaffSalaryRespVO::getSalary) diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/staffsalary/StaffSalaryMapper.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/staffsalary/StaffSalaryMapper.java index adec9565..4faa5cea 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/staffsalary/StaffSalaryMapper.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/staffsalary/StaffSalaryMapper.java @@ -3,13 +3,17 @@ package cn.iocoder.yudao.module.smartfactory.dal.mysql.staffsalary; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX; +import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.SalarySubjectItemsVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.SalaryTotalVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalaryPageReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalaryRespVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryInfoDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.staff.StaffDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.staffsalary.StaffSalaryDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Objects; /** @@ -26,7 +30,7 @@ public interface StaffSalaryMapper extends BaseMapperX { .selectAll(StaffSalaryDO.class) .selectAs(StaffDO::getNickName, StaffSalaryRespVO::getStaffName) .selectAs(StaffDO::getWorkTypeId, StaffSalaryRespVO::getWorkTypeId) - .selectAs(FactoryInfoDO::getName, StaffSalaryRespVO::getFactoryName) + .selectAs(FactoryInfoDO::getShortName, StaffSalaryRespVO::getFactoryName) .selectAs(StaffDO::getSalary, StaffSalaryRespVO::getSalary); query.leftJoin(StaffDO.class, "staff", StaffDO::getId, StaffSalaryDO::getStaffId); @@ -39,4 +43,8 @@ public interface StaffSalaryMapper extends BaseMapperX { return selectJoinPage(reqVO, StaffSalaryRespVO.class, query); } + + SalaryTotalVO selectSalaryTotal(@Param("pageReqVO") StaffSalaryPageReqVO pageReqVO); + + List selectListSalarySubjectItems(@Param("pageReqVO") StaffSalaryPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordService.java index b9dfb6d1..2518bd1f 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordService.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.smartfactory.service.attendance; import cn.iocoder.yudao.module.smartfactory.controller.admin.attendance.vo.StaffAttendanceRecordReqVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.attendance.vo.StaffAttendanceRecordRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.attendance.vo.StaffAttendanceRecordSaveReqVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.attendance.StaffAttendanceRecordDO; @@ -88,4 +89,8 @@ public interface StaffAttendanceRecordService { * @return 是否已审核 */ Integer getIsReview(Long factoryId, String month); + + List convertRecord(StaffAttendanceRecordReqVO reqVO, + List recordDOS, + List otherRecordDOS); } \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordServiceImpl.java index 2f070064..8d03329a 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/attendance/StaffAttendanceRecordServiceImpl.java @@ -3,16 +3,19 @@ package cn.iocoder.yudao.module.smartfactory.service.attendance; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.smartfactory.controller.admin.attendance.vo.AttendanceRecordVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.attendance.vo.StaffAttendanceRecordReqVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.attendance.vo.StaffAttendanceRecordRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.attendance.vo.StaffAttendanceRecordSaveReqVO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.attendance.SfAttendanceReviewDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.attendance.StaffAttendanceRecordDO; +import cn.iocoder.yudao.module.smartfactory.dal.dataobject.factoryinfo.FactoryInfoDO; +import cn.iocoder.yudao.module.smartfactory.dal.dataobject.staff.StaffDO; import cn.iocoder.yudao.module.smartfactory.dal.mysql.attendance.SfAttendanceReviewMapper; import cn.iocoder.yudao.module.smartfactory.dal.mysql.attendance.StaffAttendanceRecordMapper; +import cn.iocoder.yudao.module.smartfactory.service.factoryinfo.FactoryInfoService; +import cn.iocoder.yudao.module.smartfactory.service.staff.StaffService; import cn.iocoder.yudao.module.smartfactory.service.staffsalary.StaffSalaryService; -import cn.iocoder.yudao.module.smartfactory.framework.job.staffSalary.StaffSalaryJob; -import cn.iocoder.yudao.module.smartfactory.service.staffsalary.StaffSalaryService; -import org.springframework.data.redis.connection.stream.ObjectRecord; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -21,9 +24,12 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; import static cn.iocoder.yudao.module.smartfactory.enums.ErrorCodeConstants.STAFF_ATTENDANCE_RECORD_NOT_EXISTS; /** @@ -44,6 +50,12 @@ public class StaffAttendanceRecordServiceImpl implements StaffAttendanceRecordSe @Resource private SfAttendanceReviewMapper attendanceReviewMapper; + @Resource + private StaffService staffService; + + @Resource + private FactoryInfoService factoryInfoService; + @Override public void createStaffAttendanceRecord(List createReqVO) { @@ -56,8 +68,7 @@ public class StaffAttendanceRecordServiceImpl implements StaffAttendanceRecordSe List createDo = new ArrayList<>(); for (StaffAttendanceRecordSaveReqVO vo : createReqVO) { - List staffAttendanceRecord = new ArrayList<>(); - staffAttendanceRecord = BeanUtils.toBean(vo.getRecords(), StaffAttendanceRecordDO.class); + List staffAttendanceRecord = BeanUtils.toBean(vo.getRecords(), StaffAttendanceRecordDO.class); // 移除status为空得数据 staffAttendanceRecord.removeIf(item -> item.getStatus() == null); @@ -200,4 +211,129 @@ public class StaffAttendanceRecordServiceImpl implements StaffAttendanceRecordSe .eq(SfAttendanceReviewDO::getMonth, month)); return attendanceReviewDO != null ? attendanceReviewDO.getStatus() : 0; } + + @Override + public List convertRecord(StaffAttendanceRecordReqVO reqVO, + List recordDOS, + List otherRecordDOS) { + // 根据考勤类型 生成对应得日期数据 + List punchTimeList = new ArrayList<>(); + + // 获取所选月份的第一天 + LocalDate now = LocalDate.parse(reqVO.getMonth() + "-01", DateTimeFormatter.ISO_LOCAL_DATE); + if (reqVO.getType() == 1) { + + // 获取上月26日日期 + LocalDate beginDate = now.minusMonths(1).withDayOfMonth(26); + // 本月25日日期 + LocalDate lastMonthEnd = now.withDayOfMonth(25); + + while (!beginDate.isAfter(lastMonthEnd)) { + AttendanceRecordVO attendanceRecordVO = new AttendanceRecordVO() + .setPunchTime(beginDate); + punchTimeList.add(attendanceRecordVO); + + beginDate = beginDate.plusDays(1); + } + } + if (reqVO.getType() == 2) { + // 获取所选月份的第一天 + LocalDate firstDayOfMonth = LocalDate.parse(reqVO.getMonth() + "-01", DateTimeFormatter.ISO_LOCAL_DATE); + + // 生成当月每一天的 LocalDate + for (int i = 0; i < firstDayOfMonth.lengthOfMonth(); i++) { + AttendanceRecordVO attendanceRecordVO = new AttendanceRecordVO() + .setPunchTime(firstDayOfMonth.plusDays(i)); + punchTimeList.add(attendanceRecordVO); + } + } + // 获取员工信息 + List staffDOS = staffService.getList(convertSet(recordDOS, StaffAttendanceRecordDO::getStaffId)); + Map staffMap = convertMap(staffDOS, StaffDO::getId); + + // 获取厂区信息 + Set factoryIds = convertSet(recordDOS, StaffAttendanceRecordDO::getFactoryId); + factoryIds.addAll(convertList(otherRecordDOS, StaffAttendanceRecordDO::getFactoryId)); + List factoryDOS = factoryInfoService.getFactoryList(factoryIds); + Map factoryMap = convertMap(factoryDOS, FactoryInfoDO::getId); + + // 根据用户 分组打卡记录 + Map> recordMap = convertMultiMap(recordDOS, StaffAttendanceRecordDO::getStaffId); + + // 重组数据 + List respVOs = new ArrayList<>(); + for (Map.Entry> entry : recordMap.entrySet()) { + + if (!staffMap.containsKey(entry.getKey())) { + continue; + } + + // 设置所选厂区 员工得考勤信息 + StaffAttendanceRecordRespVO respVO = new StaffAttendanceRecordRespVO( + entry.getKey(), + reqVO.getFactoryId(), + reqVO.getType(), + reqVO.getMonth()); + + Map records = entry.getValue().stream() + .filter(record -> record.getFactoryId().equals(reqVO.getFactoryId())) // 筛选同一个工厂打卡数据 + .map(item -> BeanUtils.toBean(item, AttendanceRecordVO.class)) + .collect(Collectors.toMap(AttendanceRecordVO::getPunchTime, value -> value)); + // 设置打卡数据 + List recordVOS = punchTimeList.stream() + .map(record -> { + AttendanceRecordVO recordVO = BeanUtils.toBean(record, AttendanceRecordVO.class); + if (records.containsKey(record.getPunchTime())) { + recordVO.setStatus(records.get(record.getPunchTime()).getStatus()); + } + return recordVO; + }).collect(Collectors.toList()); + respVO.setRecords(recordVOS); + // 设置员工名称 + respVO.setStaffName(staffMap.get(entry.getKey()).getNickName()); + // 设置工种 + respVO.setWorkTypeId(staffMap.get(entry.getKey()).getWorkTypeId()); + // 设置厂区名称 + respVO.setFactoryName(factoryMap.get(reqVO.getFactoryId()) != null ? factoryMap.get(reqVO.getFactoryId()).getName() : null); + + if (CollUtil.isNotEmpty(otherRecordDOS)) { + // 获得该员工 在其他工厂的考勤记录 + Map> factoryRecordMap = convertMultiMap(otherRecordDOS, StaffAttendanceRecordDO::getFactoryId); + + List childRespVO = otherRecordDOS.stream() + .map(recordDO -> new StaffAttendanceRecordRespVO( + recordDO.getStaffId(), + recordDO.getFactoryId(), + recordDO.getType(), + recordDO.getMonth())) + .distinct() + .collect(Collectors.toList()); + + childRespVO.forEach(vo -> { + if (!staffMap.containsKey(vo.getStaffId())) { + return; + } + // 设置员工名称 + vo.setStaffName(staffMap.get(vo.getStaffId()).getNickName()); + // 设置工种 + vo.setWorkTypeId(staffMap.get(vo.getStaffId()).getWorkTypeId()); + // 设置厂区名称 + vo.setFactoryName(factoryMap.get(vo.getFactoryId()) != null ? factoryMap.get(vo.getFactoryId()).getName() : null); + + if (factoryRecordMap.containsKey(vo.getFactoryId())) { + + // 设置打卡记录 + vo.setRecords(BeanUtils.toBean(factoryRecordMap.get(vo.getFactoryId()), AttendanceRecordVO.class)); + } + }); + // 插入其他考勤记录 + respVO.setChildRecords(childRespVO); + } + + // 插入集合 + respVOs.add(respVO); + } + + return respVOs; + } } \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffService.java index 2f994148..098ed76b 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffService.java @@ -2,10 +2,7 @@ package cn.iocoder.yudao.module.smartfactory.service.staff; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory.vo.StaffDataRespVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.StaffImportExcelVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.StaffImportRespVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.StaffPageReqVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.StaffSaveReqVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.*; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.staff.StaffDO; import javax.validation.Valid; @@ -132,4 +129,10 @@ public interface StaffService { * @return 员工信息 */ StaffDO getStaffByUserId(Long userId); + + /** + * 更新员工工资 + * @param updateReqVO 更新信息 + */ + void updateStaffSalary(StaffSalaryUpdateVO updateReqVO); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java index 660f4091..f8bbd4f3 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staff/StaffServiceImpl.java @@ -11,10 +11,7 @@ import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.module.smartfactory.controller.admin.screendata.factory.vo.StaffDataRespVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.StaffImportExcelVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.StaffImportRespVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.StaffPageReqVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.StaffSaveReqVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.staff.vo.*; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.staff.StaffDO; import cn.iocoder.yudao.module.smartfactory.dal.mysql.staff.StaffMapper; import cn.iocoder.yudao.module.system.api.dept.DeptApi; @@ -288,4 +285,16 @@ public class StaffServiceImpl implements StaffService { return staffMapper.selectStaffByUserId(userId); } + + @Override + public void updateStaffSalary(StaffSalaryUpdateVO updateReqVO) { + + if (staffMapper.selectById(updateReqVO.getId()) == null) { + throw exception(STAFF_NOT_EXISTS); + } + + // 更新 + StaffDO updateObj = BeanUtils.toBean(updateReqVO, StaffDO.class); + staffMapper.updateById(updateObj); + } } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryService.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryService.java index 5f1e1d7f..c8013edb 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryService.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryService.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.smartfactory.service.staffsalary; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.SalaryTotalVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalaryPageReqVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalaryRespVO; import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalarySaveReqVO; @@ -65,4 +66,11 @@ public interface StaffSalaryService { * @param vo 考勤信息 */ void calculateSalary(List vo); + + /** + * 获取工资统计 + * @param pageReqVO 查询信息 + * @return 统计信息 + */ + SalaryTotalVO getStaffSalaryTotal(StaffSalaryPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryServiceImpl.java index 87733da5..788eb120 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/staffsalary/StaffSalaryServiceImpl.java @@ -6,9 +6,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.bpm.api.oa.BpmOALoanApi; import cn.iocoder.yudao.module.bpm.api.oa.vo.loan.BpmOALoanSumDTO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalaryPageReqVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalaryRespVO; -import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.StaffSalarySaveReqVO; +import cn.iocoder.yudao.module.smartfactory.controller.admin.staffsalary.vo.*; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.attendance.StaffAttendanceRecordDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.staff.StaffDO; import cn.iocoder.yudao.module.smartfactory.dal.dataobject.staffsalary.StaffSalaryDO; @@ -26,10 +24,7 @@ import java.math.RoundingMode; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -193,6 +188,10 @@ public class StaffSalaryServiceImpl implements StaffSalaryService { List salaryDOS = new ArrayList<>(); for (Map.Entry> entry : recordMap.entrySet()) { Long staffId = entry.getKey(); + StaffDO staffDO = staffMap.get(staffId); + if (staffDO == null) { + continue; + } // 获取该员工的上班考勤记录 List items = entry.getValue().stream() .filter(item -> item.getStatus() == 1) @@ -211,21 +210,38 @@ public class StaffSalaryServiceImpl implements StaffSalaryService { long days = ChronoUnit.DAYS.between(date[0], date[1]); int workDays = (int) days + 1; + // 设置扣款明细 默认扣除保险 50元 + salaryDO.setDeductionItems(Collections.singletonList( + new DeductionItemsVO() + .setKey("insurance") + .setValue("50") + )); + // 计算应发工资 - if (staffMap.get(staffId).getSalary() != null) { // 没有录入基本薪资时，不做计算 + BigDecimal salary = staffDO.getSalary(); + if (salary != null) { // 没有录入基本薪资时，不做计算 if (salaryDO.getAttendanceDays() == workDays) { // 设置应发工资 - salaryDO.setPayableAmount(staffMap.get(staffId).getSalary()); + salaryDO.setPayableAmount(salary); // 设置实发工资 - salaryDO.setRealAmount(staffMap.get(staffId).getSalary()); + salaryDO.setRealAmount(salary.subtract(BigDecimal.valueOf(50))); } else { - BigDecimal payableAmount = staffMap.get(staffId).getSalary().divide(BigDecimal.valueOf(workDays), RoundingMode.HALF_UP) + BigDecimal payableAmount = salary.divide(BigDecimal.valueOf(workDays), 0, RoundingMode.DOWN) .multiply(BigDecimal.valueOf(salaryDO.getAttendanceDays())); // 设置应发工资 salaryDO.setPayableAmount(payableAmount); // 设置实发工资 - salaryDO.setRealAmount(payableAmount); + salaryDO.setRealAmount(payableAmount.subtract(BigDecimal.valueOf(50))); + } + + // 设置薪资主体数据 + if (staffDO.getSalarySubject() != null) { + salaryDO.setSalarySubjectItems(Collections.singletonList( + new SalarySubjectItemsVO() + .setSalarySubjectId(staffDO.getSalarySubject()) + .setAmount(salaryDO.getPayableAmount()) + )); } } @@ -236,4 +252,28 @@ public class StaffSalaryServiceImpl implements StaffSalaryService { // 插入工资记录 staffSalaryMapper.insertBatch(salaryDOS); } + + @Override + public SalaryTotalVO getStaffSalaryTotal(StaffSalaryPageReqVO pageReqVO) { + + // 获取实发工资的合计 + SalaryTotalVO salaryTotalVO = staffSalaryMapper.selectSalaryTotal(pageReqVO); + + // 获取主体薪资的合计 + List salarySubjectItemsVO = staffSalaryMapper.selectListSalarySubjectItems(pageReqVO); + Map sumMap = salarySubjectItemsVO.stream() + .collect(Collectors.toMap( + SalarySubjectItemsVO::getSalarySubjectId, + vo -> new SalarySubjectItemsVO() + .setSalarySubjectId(vo.getSalarySubjectId()) + .setAmount(vo.getAmount()), + (vo1, vo2) -> { + vo1.setAmount(vo1.getAmount().add(vo2.getAmount())); + return vo1; + } + )); + salaryTotalVO.setSalarySubjectItems(new ArrayList<>(sumMap.values())); + + return salaryTotalVO; + } } \ No newline at end of file diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staffsalary/StaffSalaryMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staffsalary/StaffSalaryMapper.xml new file mode 100644 index 00000000..c644b4be --- /dev/null +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/staffsalary/StaffSalaryMapper.xml @@ -0,0 +1,55 @@ + + + + + + + + + +