From 07e8e34c12ffcf159a6a351be4ae95fdbf9dd443 Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Mon, 26 May 2025 16:49:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=BB=E8=81=8C=E7=A6=BB=E5=B2=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/ApplyInfoListManager.java         |  48 ++++++++
 .../system/leave/LeaveApplyController.java    |  79 ++++++++++++
 .../system/newdev/leave/leaveList.html        | 115 ++++++++++++++++++
 .../mapper/apply/TdApplyInfoListMapper.java   |   4 +
 .../service/apply/TdApplyInfoListService.java |   5 +
 .../impl/TdApplyInfoListServiceImpl.java      |   6 +
 .../system/apply/TdApplyInfoListMapper.xml    |  28 +++++
 7 files changed, 285 insertions(+)
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/leave/LeaveApplyController.java
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/newdev/leave/leaveList.html

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<TdApplyInfoList> 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<TdApplyInfoList> 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 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('离职离岗列表')" />
+</head>
+<body class="gray-bg">
+<div class="container-div" id="app">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label style="width: 80px">姓名：</label>
+                            <input type="text" name="name"/>
+                        </li>
+                        <li>
+                            <label>性别：</label>
+                            <input type="text" name="sex"/>
+                        </li>
+                        <li>
+                            <label>身份证号：</label>
+                            <input type="text" name="cerno"/>
+                        </li>
+                        <li>
+                            <label>联系方式：</label>
+                            <input type="text" name="phone"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var detailFlag = [[${@permission.hasPermi('system:leave:leaveFile')}]]
+    var applyState = [[${@dict.getType('sys_user_apply_status')}]];
+    var prefix = ctx + "system/leaveList";
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            detailUrl:prefix + "/leaveFile/{id}",
+            modalName: "离职离岗",
+            type: 0,
+            columns: [
+                {
+                    field: 'applyId',
+                    title: 'id',
+                    visible: false
+                },
+
+                {
+                    field: 'name',
+                    title: '姓名'
+                },
+                {
+                    field: 'sex',
+                    title: '性别'
+                },
+                {
+                    field: 'nationality',
+                    title: '民族',
+                },
+                {
+                    field: 'maritalStatus',
+                    title: '婚姻状况',
+                },
+                {
+                    field: 'cerno',
+                    title: '身份证号',
+                },
+                {
+                    field: 'phone',
+                    title: '联系方式',
+                },
+                {
+                    field: 'smPost',
+                    title: '已（拟）任涉密岗位',
+                },
+                {
+                    field: 'smGrade',
+                    title: '涉密等级',
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间',
+                    sortable: true
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.applyId + '\')"><i class="fa fa-edit"></i>材料提交</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+
+</script>
+</body>
+</html>
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<TdApplyInfoList> {
     public List<TdApplyInfoList> selectAbroadInfoListList(TdApplyInfoListDTO applyInfoListDTO);
 
 
+    public List<TdApplyInfoList> 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<TdApplyInfoList> {
 
 
 
+    public List<TdApplyInfoList> 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<TdApplyInfoListMappe
     public List<TdApplyInfoList> selectAbroadInfoListList(TdApplyInfoListDTO applyInfoListDTO) {
         return applyInfoListMapper.selectAbroadInfoListList(applyInfoListDTO);
     }
+
+    @DataScope(deptAlias = "d")
+    @Override
+    public List<TdApplyInfoList> 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 @@
         </trim>
         ORDER BY create_time DESC
     </select>
+    <select id="selectPersonLeaveList" resultType="com.ruoyi.system.domain.apply.TdApplyInfoList">
+        select  <include refid="Base_Column_List"/> from  td_apply_info_list d
+        <trim prefix="where" prefixOverrides="and|or">
+            <if test="name!=null and name!=''">
+                AND name = #{name}
+            </if>
+            <if test="nationa!=null and nationa!=''">
+                AND nationa = #{nationa}
+            </if>
+            <if test="formerName!=null and formerName!=''">
+                AND former_name = #{formerName}
+            </if>
+            <if test="cerno!=null and cerno!=''">
+                AND cerno = #{cerno}
+            </if>
+            <if test="phone!=null and phone!=''">
+                AND phone = #{phone}
+            </if>
+            <if test="smPost!=null and smPost!=''">
+                AND sm_post = #{smPost}
+            </if>
+            AND  apply_status in ('5','8')
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </trim>
+        ORDER BY create_time DESC
+
+    </select>
 
 
 </mapper>