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