From e51ee4d9b7e0ce84142b1a00b3011ad74db0a798 Mon Sep 17 00:00:00 2001 From: wangxy <1481820854@qq.com> Date: Thu, 15 May 2025 17:27:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=89=BF=E8=AF=BA=E4=B9=A6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/ApplyInfoListManager.java | 26 +++++- .../apply/PromiseInfoListController.java | 81 +++++++++++++++++++ .../system/domain/apply/TdApplyInfoList.java | 2 +- .../mapper/apply/TdApplyInfoListMapper.java | 4 + .../service/apply/TdApplyInfoListService.java | 4 + .../impl/TdApplyInfoListServiceImpl.java | 6 ++ .../system/apply/TdApplyInfoListMapper.xml | 27 +++++++ 7 files changed, 146 insertions(+), 4 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.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 02244dd0..f83489af 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 @@ -51,6 +51,10 @@ public class ApplyInfoListManager { return applyInfoListService.selectTdAuditInfoListList(applyInfoListDTO); } + public List selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO) { + return applyInfoListService.selectPromiseInfoListList(applyInfoListDTO); + } + @Transactional(rollbackFor = Exception.class) public boolean saveOrUpdate(TdApplyInfoListDTO applyInfoListDTO) { @@ -82,7 +86,9 @@ public class ApplyInfoListManager { } - + /** + * 上岗提交 + */ public boolean submit(String applyId) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) @@ -91,8 +97,9 @@ public class ApplyInfoListManager { } - - + /** + * 审核通过 + */ public boolean submitAudit(String applyId) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) @@ -102,6 +109,9 @@ public class ApplyInfoListManager { + /** + * 审核不通过 + */ public boolean goBack(String applyId,String applyMsg) { return applyInfoListService.lambdaUpdate() .eq(TdApplyInfoList::getApplyId,applyId) @@ -111,6 +121,16 @@ public class ApplyInfoListManager { } + /** + * 承诺书提交 + */ + public boolean submitPromise(String applyId) { + return applyInfoListService.lambdaUpdate() + .eq(TdApplyInfoList::getApplyId,applyId) + .set(TdApplyInfoList::getApplyStatus,5).update(); + } + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.java new file mode 100644 index 00000000..0314d455 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.java @@ -0,0 +1,81 @@ +package com.ruoyi.web.controller.system.apply; + +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.system.domain.apply.TdApplyInfoList; +import com.ruoyi.system.domain.apply.dto.TdApplyInfoListDTO; +import com.ruoyi.web.controller.manager.ApplyInfoListManager; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * ClassName: ApplyInfoListController + * Package: com.ruoyi.web.controller.system.apply + * Description:承诺书上传 + * + * @Author wangxy + * @Create 2025/5/14 11:32 + * @Version 1.0 + */ +@Controller +@RequestMapping("/system/promiseList") +public class PromiseInfoListController extends BaseController { + + + private String prefix = "system/newdev/promise"; + + + @Resource + private ApplyInfoListManager applyInfoListManager; + + @RequiresPermissions("system:promise:view") + @GetMapping() + public String promiseListInfo() { + return prefix + "/promiseList"; + } + /** + * 人员列表 + */ + @RequiresPermissions("system:promise:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TdApplyInfoListDTO applyInfoListDTO) { + startPage(); + List tdApplyInfoLists = applyInfoListManager.selectPromiseInfoListList(applyInfoListDTO); + return getDataTable(tdApplyInfoLists); + } + + /** + * 承诺书 + */ + @RequiresPermissions("system:promise:editPromise") + @GetMapping("/editPromise/{applyId}") + public String editPromise(@PathVariable("applyId") String applyId, ModelMap mmap) { + TdApplyInfoListDTO applyInfoList = applyInfoListManager.getTdApplyInfoList(applyId); + mmap.put("applyInfoList", applyInfoList); + return prefix + "/editAudit"; + } + + /** + * 承诺书提交 + */ + @PostMapping("/submitPromise") + @ResponseBody + public AjaxResult submitPromise(@RequestParam String applyId) { + return toAjax(applyInfoListManager.submitPromise(applyId)); + } + + + + + + + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java index f3834936..9a659b17 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/apply/TdApplyInfoList.java @@ -36,7 +36,7 @@ public class TdApplyInfoList extends BaseEntity { private String nationa; /** - * 申请状态（0：保存1：已提交，2，审核通过，3退回，4结束） + * 申请状态（0：保存1：已提交，2，审核通过，3退回，4培训教育提交，5承诺书上传） */ private Integer applyStatus; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java index 9e813ca1..7b593f89 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/apply/TdApplyInfoListMapper.java @@ -22,6 +22,10 @@ public interface TdApplyInfoListMapper extends BaseMapper { public List selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO); + public List selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO); + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java index 6e11711a..1406e8b9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/TdApplyInfoListService.java @@ -21,5 +21,9 @@ public interface TdApplyInfoListService extends IService { public List selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO); + public List selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO); + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java index 3047466c..63d405a8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/apply/impl/TdApplyInfoListServiceImpl.java @@ -42,6 +42,12 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl selectTdAuditInfoListList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListMapper.selectTdAuditInfoListList(applyInfoListDTO); } + + @DataScope(deptAlias = "d") + @Override + public List selectPromiseInfoListList(TdApplyInfoListDTO applyInfoListDTO) { + return Collections.emptyList(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml index 0da05232..28a903dc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml @@ -132,6 +132,33 @@ ORDER BY create_time DESC +