Merge remote-tracking branch 'origin/ln_ry20250512' into ln_ry20250512

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;
@@ -38,15 +39,29 @@ public class ApplyInfoListManager {
     private TdFileRelationService fileRelationService;
 
 
-
+    /**
+     * 人员登记
+     * @param applyInfoListDTO
+     * @return
+     */
     public List<TdApplyInfoList> selectTdApplyInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
         return applyInfoListService.selectTdApplyInfoListList(applyInfoListDTO);
     }
 
+    /**
+     * 培训教育
+     * @param applyInfoListDTO
+     * @return
+     */
     public List<TdApplyInfoList> selectTdApplyInfoListListByApplyStatus(TdApplyInfoListDTO applyInfoListDTO) {
         return applyInfoListService.selectTdApplyInfoListListByApplyStatus(applyInfoListDTO);
     }
 
+    /**
+     * 人员审查
+     * @param applyInfoListDTO
+     * @return
+     */
     public List<TdApplyInfoList> selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
         return applyInfoListService.selectTdAuditInfoListList(applyInfoListDTO);
     }
@@ -101,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);
     }
 
@@ -125,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();
     }
 
@@ -136,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();
     }
 
@@ -148,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();
     }
@@ -160,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();
     }
 
 

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;
@@ -44,10 +45,9 @@ public class TrainInfoListManager {
         /**
          * 申请状态（0：保存1：已提交，2，审核通过，3退回，4培训教育提交，5承诺书上传）
          */
-        TdApplyInfoList applyInfoList = new TdApplyInfoList();
+        applyInfoListService.lambdaUpdate().
-        applyInfoList.setApplyId(tdTrainDTO.getApplyId());
+                eq(TdApplyInfoList::getApplyId,tdTrainDTO.getApplyId()).
-        applyInfoList.setApplyStatus("4");
+                set(TdApplyInfoList::getApplyStatus, ApplyListStatusEnum.TRAIN.getStatus()).update();
-        applyInfoListService.saveOrUpdate(applyInfoList);
         return trainService.saveOrUpdate(train);
     }
 }

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

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;
+    }
+}