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 f7206408..d73143fa 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 @@ -104,6 +104,16 @@ public class ApplyInfoListManager { } + /** + * 涉密离职 + * @param applyInfoListDTO + * @return + */ + public List selectPersonLeaveList(TdApplyInfoListDTO applyInfoListDTO) { + return applyInfoListService.selectPersonLeaveList(applyInfoListDTO); + } + + @Transactional(rollbackFor = Exception.class) public boolean saveOrUpdate(TdApplyInfoListDTO applyInfoListDTO) { TdApplyInfoList applyInfoList = Convert.convert(TdApplyInfoList.class, applyInfoListDTO); @@ -181,5 +191,43 @@ public class ApplyInfoListManager { + /** + * 离职提交 + */ + public boolean submitLeave(String applyId) { + return applyInfoListService.lambdaUpdate() + .eq(TdApplyInfoList::getApplyId,applyId) + .set(TdApplyInfoList::getApplyStatus,ApplyListStatusEnum.LEAVESUBMIT.getStatus()) + .update(); + } + + + + /** + * 离职审核通过 + */ + public boolean submitLeaveAudit(String applyId) { + return applyInfoListService.lambdaUpdate() + .eq(TdApplyInfoList::getApplyId,applyId) + .set(TdApplyInfoList::getApplyStatus,ApplyListStatusEnum.LEAVEADUIT.getStatus()) + .set(TdApplyInfoList::getLeaveTime,new Date()).update(); + } + + + + /** + * 离职离岗审核不通过 + */ + public boolean goBackLeave(String applyId,String leaveMsg) { + return applyInfoListService.lambdaUpdate() + .eq(TdApplyInfoList::getApplyId,applyId) + .set(TdApplyInfoList::getApplyStatus,ApplyListStatusEnum.LEAVEBACK.getStatus()) + .set(Objects.nonNull(leaveMsg), TdApplyInfoList::getLeaveMsg, leaveMsg) + .update(); + } + + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/leave/LeaveApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/leave/LeaveApplyController.java new file mode 100644 index 00000000..99c60686 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/leave/LeaveApplyController.java @@ -0,0 +1,79 @@ +package com.ruoyi.web.controller.system.leave; + +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/leaveList") +public class LeaveApplyController extends BaseController { + + + private String prefix = "system/newdev/leave"; + + + @Resource + private ApplyInfoListManager applyInfoListManager; + + @RequiresPermissions("system:leave:view") + @GetMapping() + public String leaveListInfo() { + return prefix + "/leaveList"; + } + /** + * 人员离职列表 + */ + @RequiresPermissions("system:leave:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(TdApplyInfoListDTO applyInfoListDTO) { + startPage(); + List tdApplyInfoLists = applyInfoListManager.selectPersonLeaveList(applyInfoListDTO); + return getDataTable(tdApplyInfoLists); + } + + /** + * 人员离职 + */ + @RequiresPermissions("system:leave:leaveFile") + @GetMapping("/leaveFile/{applyId}") + public String leaveFile(@PathVariable("applyId") String applyId, ModelMap mmap) { + TdApplyInfoListDTO applyInfoList = applyInfoListManager.getTdApplyInfoList(applyId); + mmap.put("applyInfoList", applyInfoList); + return prefix + "/leaveFile"; + } + + + + /** + * 离职离岗提交 + */ + @PostMapping("/submitLeave") + @ResponseBody + public AjaxResult submitLeave(@RequestParam String applyId) { + return toAjax(applyInfoListManager.submitLeave(applyId)); + } + + + + +} diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveList.html new file mode 100644 index 00000000..68b74474 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveList.html @@ -0,0 +1,115 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • +  搜索 +  重置 +
  • +
+
+
+
+ +
+
+
+
+
+
+
+ + + + 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 dc0227d3..62292aef 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 @@ -35,6 +35,10 @@ public interface TdApplyInfoListMapper extends BaseMapper { public List selectAbroadInfoListList(TdApplyInfoListDTO applyInfoListDTO); + public List selectPersonLeaveList(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 cae924f5..7c0aed1a 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 @@ -35,6 +35,11 @@ public interface TdApplyInfoListService extends IService { + public List selectPersonLeaveList(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 48726d6b..2ecf4ca0 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 @@ -66,6 +66,12 @@ public class TdApplyInfoListServiceImpl extends ServiceImpl selectAbroadInfoListList(TdApplyInfoListDTO applyInfoListDTO) { return applyInfoListMapper.selectAbroadInfoListList(applyInfoListDTO); } + + @DataScope(deptAlias = "d") + @Override + public List selectPersonLeaveList(TdApplyInfoListDTO applyInfoListDTO) { + return applyInfoListMapper.selectPersonLeaveList(applyInfoListDTO); + } } 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 491676de..bbb6e5bb 100644 --- a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml @@ -243,6 +243,34 @@ ORDER BY create_time DESC +