yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
@@ -51,7 +51,7 @@ @Tag(name = "管理后台 - ERP 采购来票") @RestController @RequestMapping({"/erp/purchase-invoice", "/purchase/invoice"}) @RequestMapping({"/purchase/invoice", "/erp/purchase-invoice"}) @Validated public class ErpPurchaseInvoiceController {
@@ -47,7 +47,7 @@ @Tag(name = "管理后台 - ERP 采购订单") @RestController @RequestMapping({"/erp/purchase-order", "/purchase/order"}) @RequestMapping({"/purchase/order", "/erp/purchase-order"}) @Validated public class ErpPurchaseOrderController {
@@ -48,7 +48,7 @@ @Tag(name = "管理后台 - ERP 采购计划") @RestController @RequestMapping({"/erp/purchase-plan", "/purchase/plan"}) @RequestMapping({"/purchase/plan", "/erp/purchase-plan"}) @Validated public class ErpPurchasePlanController {
@@ -47,7 +47,7 @@ @Tag(name = "管理后台 - ERP 采购申请") @RestController @RequestMapping({"/erp/purchase-request", "/purchase/request"}) @RequestMapping({"/purchase/request", "/erp/purchase-request"}) @Validated public class ErpPurchaseRequestController {
@@ -69,6 +69,8 @@ ErrorCode ATTENDANCE_RECORD_EXISTS = new ErrorCode(1_030_004_002, "该员工当日考勤记录已存在"); ErrorCode ATTENDANCE_EXCEPTION_NOT_EXISTS = new ErrorCode(1_030_004_003, "考勤异常申请不存在"); ErrorCode ATTENDANCE_EXCEPTION_SUBMIT_FAIL_NOT_DRAFT = new ErrorCode(1_030_004_004, "考勤异常申请提交失败，原因：不是草稿状态"); ErrorCode ATTENDANCE_EXCEPTION_UPDATE_FAIL_NOT_DRAFT = new ErrorCode(1_030_004_017, "考勤异常申请更新失败，原因：不是草稿状态"); ErrorCode ATTENDANCE_EXCEPTION_DELETE_FAIL_NOT_DRAFT = new ErrorCode(1_030_004_018, "考勤异常申请删除失败，原因：不是草稿状态"); ErrorCode ATTENDANCE_RULE_NOT_EXISTS = new ErrorCode(1_030_004_005, "考勤规则不存在"); ErrorCode ATTENDANCE_RULE_NAME_EXISTS = new ErrorCode(1_030_004_006, "考勤规则名称已存在"); ErrorCode ATTENDANCE_RULE_DEPT_EXISTS = new ErrorCode(1_030_004_007, "该部门已配置考勤规则"); yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmResignationApplicationServiceImpl.java
@@ -41,6 +41,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*; @@ -94,11 +96,13 @@ AdminUserRespDTO user = adminUserApi.getUser(userId); if (user == null) { userId = getCurrentUserId(); user = adminUserApi.getUser(userId); } HrmResignationApplicationDO application = BeanUtils.toBean(createReqVO, HrmResignationApplicationDO.class); application.setNo(no); application.setUserId(userId); application.setDeptId(createReqVO.getDeptId() != null ? createReqVO.getDeptId() : user.getDeptId()); application.setDeptId(createReqVO.getDeptId() != null ? createReqVO.getDeptId() : (user != null ? user.getDeptId() : null)); application.setStatus(HrmAuditStatusEnum.DRAFT.getStatus()); application.setHandoverStatus(HANDOVER_STATUS_NOT_STARTED); resignationApplicationMapper.insert(application); @@ -108,7 +112,7 @@ } private Long getCurrentUserId() { return 1L; return SecurityFrameworkUtils.getLoginUserId(); } private String generateUniqueNo() { @@ -175,8 +179,8 @@ } private void fillUserNames(HrmResignationApplicationRespVO respVO, HrmResignationApplicationDO application) { Set<Long> userIds = Set.of(application.getUserId(), application.getHandoverUserId()) .stream().filter(Objects::nonNull).collect(Collectors.toSet()); Set<Long> userIds = Stream.of(application.getUserId(), application.getHandoverUserId()) .filter(Objects::nonNull).collect(Collectors.toSet()); Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); if (application.getUserId() != null && userMap.containsKey(application.getUserId())) { respVO.setUserName(userMap.get(application.getUserId()).getNickname()); yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/approval/HrmTransferApplicationServiceImpl.java
@@ -41,6 +41,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; import static cn.iocoder.yudao.module.hrm.enums.ErrorCodeConstants.*; @@ -108,7 +110,7 @@ } private Long getCurrentUserId() { return 1L; return SecurityFrameworkUtils.getLoginUserId(); } private String generateUniqueNo() { @@ -182,8 +184,8 @@ } private void fillDeptNames(HrmTransferApplicationRespVO respVO, HrmTransferApplicationDO application) { Set<Long> deptIds = Set.of(application.getCurrentDeptId(), application.getTargetDeptId()) .stream().filter(Objects::nonNull).collect(Collectors.toSet()); Set<Long> deptIds = Stream.of(application.getCurrentDeptId(), application.getTargetDeptId()) .filter(Objects::nonNull).collect(Collectors.toSet()); Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds); if (application.getCurrentDeptId() != null && deptMap.containsKey(application.getCurrentDeptId())) { respVO.setCurrentDeptName(deptMap.get(application.getCurrentDeptId()).getName()); @@ -194,8 +196,8 @@ } private void fillPostNames(HrmTransferApplicationRespVO respVO, HrmTransferApplicationDO application) { Set<Long> postIds = Set.of(application.getCurrentPostId(), application.getTargetPostId()) .stream().filter(Objects::nonNull).collect(Collectors.toSet()); Set<Long> postIds = Stream.of(application.getCurrentPostId(), application.getTargetPostId()) .filter(Objects::nonNull).collect(Collectors.toSet()); Map<Long, PostRespDTO> postMap = postApi.getPostMap(postIds); if (application.getCurrentPostId() != null && postMap.containsKey(application.getCurrentPostId())) { respVO.setCurrentPostName(postMap.get(application.getCurrentPostId()).getName()); yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/service/attendance/HrmAttendanceExceptionServiceImpl.java
@@ -71,7 +71,10 @@ @Override public void updateAttendanceException(HrmAttendanceExceptionSaveReqVO updateReqVO) { validateAttendanceExceptionExists(updateReqVO.getId()); HrmAttendanceExceptionDO attendanceException = validateAttendanceExceptionExists(updateReqVO.getId()); if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())) { throw exception(ATTENDANCE_EXCEPTION_UPDATE_FAIL_NOT_DRAFT); } HrmAttendanceExceptionDO updateObj = BeanUtils.toBean(updateReqVO, HrmAttendanceExceptionDO.class); attendanceExceptionMapper.updateById(updateObj); storageAttachmentApi.updateAttachments("file", "hrm_attendance_exception", updateReqVO.getId(), updateReqVO.getBlobIds()); @@ -79,7 +82,10 @@ @Override public void deleteAttendanceException(Long id) { validateAttendanceExceptionExists(id); HrmAttendanceExceptionDO attendanceException = validateAttendanceExceptionExists(id); if (!HrmAuditStatusEnum.DRAFT.getStatus().equals(attendanceException.getStatus())) { throw exception(ATTENDANCE_EXCEPTION_DELETE_FAIL_NOT_DRAFT); } storageAttachmentApi.deleteAttachmentsByRecord("hrm_attendance_exception", id); attendanceExceptionMapper.deleteById(id); }
