From 5921928c962dfc56241325ad3fb1c2792a815ced Mon Sep 17 00:00:00 2001 From: aikai Date: Tue, 27 Aug 2024 09:19:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(attendance):=20=E6=B7=BB=E5=8A=A0=E8=A1=A5?= =?UTF-8?q?=E5=8D=A1=E5=8A=9F=E8=83=BD=E5=92=8C=E8=B4=A2=E5=8A=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=8F=96=E6=B6=88=E9=A2=86=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在考勤功能中,增加补卡次数限制和补卡操作接口。- 财务支付功能中,增加取消领取操作,优化支付管理。 重构和样式调整: - 无 fixes: -无 BREAKING CHANGE: -考勤组实体和相关请求/响应VO中增加replacementCardNum字段,以支持补卡次数限制。 - 财务支付的取消领取操作可能会对相关业务逻辑产生影响,需确保在使用前进行测试。 --- .../FinancialPaymentController.java | 10 ++- .../vo/FinancialPaymentPageReqVO.java | 3 + .../FinancialPaymentMapper.java | 9 +++ .../FinancialPaymentService.java | 7 ++ .../FinancialPaymentServiceImpl.java | 5 ++ .../FinancialPaymentMapper.xml | 11 +++ .../system/enums/ErrorCodeConstants.java | 3 + .../attendance/AttendanceController.java | 14 ++++ .../dto/AttendanceReplacementCardDTO.java | 21 ++++++ .../group/vo/AttendanceGroupPageReqVO.java | 5 ++ .../admin/group/vo/AttendanceGroupRespVO.java | 4 + .../group/vo/AttendanceGroupSaveReqVO.java | 2 + .../attendance/group/AttendanceGroupDO.java | 5 ++ .../service/attendance/AttendanceService.java | 26 +++++++ .../attendance/AttendanceServiceImpl.java | 74 +++++++++++++++++++ 15 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/dto/AttendanceReplacementCardDTO.java diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/FinancialPaymentController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/FinancialPaymentController.java index 079a52a8..74cae05b 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/FinancialPaymentController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/FinancialPaymentController.java @@ -62,6 +62,13 @@ public class FinancialPaymentController { return success(true); } + @PostMapping("/cancel") + @Operation(summary = "取消领取") + public CommonResult cancel(@RequestBody List ids) { + financialPaymentService.cancel(ids); + return success(true); + } + @DeleteMapping("/delete") @Operation(summary = "删除财务支付管理") @Parameter(name = "id", description = "编号", required = true) @@ -88,7 +95,8 @@ public class FinancialPaymentController { item.setFinancialPaymentId(financialPaymentItemDO.getFinancialPaymentId()); item.setCreateTime(financialPaymentItemDO.getCreateTime()); if (CollectionUtil.isNotEmpty(financialPaymentItemDO.getFileItems())) { - item.setFileItems(new ArrayList()); + List uploadUserFiles = BeanUtils.toBean(financialPaymentItemDO.getFileItems(), UploadUserFile.class); + item.setFileItems(uploadUserFiles); } items.add(item); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentPageReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentPageReqVO.java index b982b385..4ca64098 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentPageReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/financialpayment/vo/FinancialPaymentPageReqVO.java @@ -24,6 +24,9 @@ public class FinancialPaymentPageReqVO extends PageParam { @Schema(description = "申请人的用户名称", example = "13599") private String nickname; + @Schema(description = "财务名称", example = "13599") + private String financeName; + @Schema(description = "原因", example = "13599") private String reason; diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/financialpayment/FinancialPaymentMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/financialpayment/FinancialPaymentMapper.java index 0972765f..49c6aa4c 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/financialpayment/FinancialPaymentMapper.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/financialpayment/FinancialPaymentMapper.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 财务支付管理 Mapper * @@ -32,4 +34,11 @@ public interface FinancialPaymentMapper extends BaseMapperX * @return */ FinancialPaymentDO getFinancialPayment(@Param("id") Long id); + + /** + * 拒绝领取 + * + * @param ids + */ + void cancel(@Param("ids") List ids); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentService.java index a461c748..5c159489 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentService.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentService.java @@ -74,4 +74,11 @@ public interface FinancialPaymentService { * @param financialPayment */ void updateById(FinancialPaymentDO financialPayment); + + /** + * 取消领取 + * + * @param ids + */ + void cancel(List ids); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentServiceImpl.java index 1af8195f..2fec7e34 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/financialpayment/FinancialPaymentServiceImpl.java @@ -169,4 +169,9 @@ public class FinancialPaymentServiceImpl implements FinancialPaymentService { financialPaymentMapper.updateById(financialPayment); } + @Override + public void cancel(List ids) { + financialPaymentMapper.cancel(ids); + } + } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/financialpayment/FinancialPaymentMapper.xml b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/financialpayment/FinancialPaymentMapper.xml index 382893d7..2e32b7a8 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/financialpayment/FinancialPaymentMapper.xml +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/financialpayment/FinancialPaymentMapper.xml @@ -40,6 +40,9 @@ and a.reason like concat('%', #{vo.reason}, '%') + + and d.nickname like concat('%', #{vo.financeName}, '%') + and a.receive_user_id is null @@ -73,6 +76,14 @@ ORDER BY a.status asc,a.end_time DESC + + update bpm_financial_payment set receive_user_id = null + where id in + + #{id} + + and status = 0 +