From 77f907a8b78ac003d0cf154cd5b5f745765ffa02 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Wed, 21 May 2025 15:14:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=BA=BA=E5=91=98=E5=87=BA=E5=9B=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manager/ApplyInfoListManager.java | 16 +++++++++++++++- .../controller/manager/TrainInfoListManager.java | 7 +++---- .../system/apply/TrainInfoListController.java | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java index 28241553..8c8e5829 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java @@ -38,15 +38,29 @@ public class ApplyInfoListManager { private TdFileRelationService fileRelationService; - + /** + * 人员登记 + * @param applyInfoListDTO + * @return + */ public List selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListService.selectTdApplyInfoListList(applyInfoListDTO); } + /** + * 培训教育 + * @param applyInfoListDTO + * @return + */ public List selectTdApplyInfoListListByApplyStatus(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListService.selectTdApplyInfoListListByApplyStatus(applyInfoListDTO); } + /** + * 人员审查 + * @param applyInfoListDTO + * @return + */ public List selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListService.selectTdAuditInfoListList(applyInfoListDTO); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TrainInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TrainInfoListManager.java index 9eaa0972..0d6281ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TrainInfoListManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TrainInfoListManager.java @@ -44,10 +44,9 @@ public class TrainInfoListManager { /** * 申请状态（0：保存1：已提交，2，审核通过，3退回，4培训教育提交，5承诺书上传） */ - TdApplyInfoList applyInfoList = new TdApplyInfoList(); - applyInfoList.setApplyId(tdTrainDTO.getApplyId()); - applyInfoList.setApplyStatus("4"); - applyInfoListService.saveOrUpdate(applyInfoList); + applyInfoListService.lambdaUpdate(). + eq(TdApplyInfoList::getApplyId,tdTrainDTO.getApplyId()). + set(TdApplyInfoList::getApplyStatus,"4").update(); return trainService.saveOrUpdate(train); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/TrainInfoListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/TrainInfoListController.java index b38c095c..9235f060 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/TrainInfoListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/TrainInfoListController.java @@ -23,7 +23,7 @@ import java.util.List; /** * ClassName: TrainInfoListController * Package: com.ruoyi.web.controller.system.apply - * Description: + * Description:培训教育 * * @Author zhaodw * @Create 2025/5/15 15:31 From 888ef5219fcf9e0967cb69142cf9c7409cbe31e8 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Wed, 21 May 2025 15:27:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:Enum=E6=B5=81=E7=A8=8B=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/ApplyInfoListManager.java | 11 +++--- .../manager/TrainInfoListManager.java | 3 +- .../common/enums/ApplyListStatusEnum.java | 36 +++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/ApplyListStatusEnum.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java index 8c8e5829..f7206408 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/ApplyInfoListManager.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.manager; import cn.hutool.core.convert.Convert; import cn.hutool.core.text.CharSequenceUtil; +import com.ruoyi.common.enums.ApplyListStatusEnum; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.system.domain.apply.TdApplyInfoList; import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; @@ -115,7 +116,7 @@ public class ApplyInfoListManager { applyInfoList.setCreateBy(ShiroUtils.getSysUser().getUserName()); } applyInfoList.setDeptId(ShiroUtils.getSysUser().getDeptId()); - applyInfoList.setApplyStatus("0"); + applyInfoList.setApplyStatus(ApplyListStatusEnum.NEWSAVE.getStatus()); return applyInfoListService.saveOrUpdate(applyInfoList); } @@ -139,7 +140,7 @@ public class ApplyInfoListManager { public boolean submit(String applyId) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) - .set(TdApplyInfoList::getApplyStatus,"1") + .set(TdApplyInfoList::getApplyStatus,ApplyListStatusEnum.SUBMIT.getStatus()) .set(TdApplyInfoList::getAppTime,new Date()).update(); } @@ -150,7 +151,7 @@ public class ApplyInfoListManager { public boolean submitAudit(String applyId) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) - .set(TdApplyInfoList::getApplyStatus,"2") + .set(TdApplyInfoList::getApplyStatus,ApplyListStatusEnum.AUDITED.getStatus()) .set(TdApplyInfoList::getAuthTime,new Date()).update(); } @@ -162,7 +163,7 @@ public class ApplyInfoListManager { public boolean goBack(String applyId,String applyMsg) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) - .set(TdApplyInfoList::getApplyStatus,"3") + .set(TdApplyInfoList::getApplyStatus,ApplyListStatusEnum.GOBACK.getStatus()) .set(Objects.nonNull(applyMsg), TdApplyInfoList::getApplyMsg, applyMsg) .update(); } @@ -174,7 +175,7 @@ public class ApplyInfoListManager { public boolean submitPromise(String applyId) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) - .set(TdApplyInfoList::getApplyStatus,"5").update(); + .set(TdApplyInfoList::getApplyStatus,ApplyListStatusEnum.PROMISE.getStatus()).update(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TrainInfoListManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TrainInfoListManager.java index 0d6281ff..da293345 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TrainInfoListManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/TrainInfoListManager.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.manager; import cn.hutool.core.convert.Convert; +import com.ruoyi.common.enums.ApplyListStatusEnum; import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.system.domain.apply.TdApplyInfoList; import com.ruoyi.system.domain.train.TdTrain; @@ -46,7 +47,7 @@ public class TrainInfoListManager { */ applyInfoListService.lambdaUpdate(). eq(TdApplyInfoList::getApplyId,tdTrainDTO.getApplyId()). - set(TdApplyInfoList::getApplyStatus,"4").update(); + set(TdApplyInfoList::getApplyStatus, ApplyListStatusEnum.TRAIN.getStatus()).update(); return trainService.saveOrUpdate(train); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ApplyListStatusEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ApplyListStatusEnum.java new file mode 100644 index 00000000..5cf26427 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ApplyListStatusEnum.java @@ -0,0 +1,36 @@ +package com.ruoyi.common.enums; + +import lombok.Getter; + +/** + * 流程状态 + * + * @author wangxy + * @date 2024/4/11 9:15 + */ +@Getter +public enum ApplyListStatusEnum { + /**新建*/ + NEWSAVE("0","保存"), + /**已提交*/ + SUBMIT("1","已提交"), + /**审核通过*/ + AUDITED("2","审核通过"), + /**审核不通过*/ + GOBACK("3","退回"), + /**培训教育提交*/ + TRAIN("4","培训教育提交"), + /**承诺书已上传*/ + PROMISE("5","承诺书已上传"); + + + private final String status; + + + private final String description; + + ApplyListStatusEnum(String status, String description){ + this.status = status; + this.description = description; + } +}