From 1a362580396e48029342ed40adf6564214e9afda Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Tue, 28 May 2024 15:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E5=8F=91=E5=88=A0=E9=99=A4=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filemanager/TdFileProvideController.java     | 15 ++++++++++++++-
 .../system/fileprovide/fileprovide.html          |  3 ---
 .../resources/templates/system/leave/leave.html  |  5 +++--
 .../java/com/ruoyi/system/domain/TdTrain.java    | 16 ++++++++--------
 .../resources/mapper/system/SysUserMapper.xml    |  3 +++
 .../resources/mapper/system/TdLeaveMapper.xml    |  2 +-
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java
index fb8cf64..1ad5f04 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileProvideController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system.filemanager;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysDept;
@@ -153,7 +154,19 @@ public class TdFileProvideController extends BaseController
     @ResponseBody
     public AjaxResult remove(String ids)
     {
-        return toAjax(tdFileProvideService.deleteTdFileProvideByFileIds(ids));
+        List<TdFileReceive> tdFileReceives = tdFileReceiveService.selectTdFileReceiveByFileId(ids);
+        List<String> statesList = new ArrayList<>();
+        for (TdFileReceive tdFileReceive : tdFileReceives) {
+            statesList.add(tdFileReceive.getReceiveState());
+        }
+        if (statesList.contains("1")){
+            return AjaxResult.error("下发的已被接收文件不能删除");
+        }else {
+            for (TdFileReceive tdFileReceive : tdFileReceives){
+                tdFileReceiveService.deleteTdFileReceiveByReceiveId(tdFileReceive.getReceiveId());
+            }
+            return toAjax(tdFileProvideService.deleteTdFileProvideByFileIds(ids));
+        }
     }
 
     /**
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
index a8184a7..b058bdf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/fileprovide.html
@@ -42,9 +42,6 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:fileprovide:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:fileprovide:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
                 <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:fileprovide:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
index 8c96c33..24ff850 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/leave.html
@@ -64,6 +64,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:leave:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:leave:remove')}]];
+        var PrintFlag = [[${@permission.hasPermi('system:leave:print')}]];
         var downloadFlag = [[${@permission.hasPermi('system:leave:examine')}]];
         var examinestateDatas = [[${@dict.getType('sys_examine_state')}]];
         var leavestateData = [[${@dict.getType('sys_user_leave')}]];
@@ -146,8 +147,8 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="leaveAuditing(\'' + row.id +  '\')"><i class="fa fa-edit"></i>审核</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="auditingPrint(\'' + row.id + '/' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="leaveAuditing(\'' + row.id +  '\')"><i class="fa fa-edit"></i>审核</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + PrintFlag + '" href="javascript:void(0)" onclick="auditingPrint(\'' + row.id + '/' + row.userId + '\')"><i class="fa fa-download"></i>打印</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java
index 228377f..40aeff1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java
@@ -41,8 +41,8 @@ public class TdTrain extends BaseEntity
     private String trainAddress;
 
     /** 培训日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
-    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd HH:MM:SS")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "培训日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date trainDate;
 
     /** 创建人 */
@@ -54,8 +54,8 @@ public class TdTrain extends BaseEntity
     private String createDepartid;
 
     /** 创建日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
-    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd HH:MM:SS")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date createDate;
 
     /** 更新单位 */
@@ -67,8 +67,8 @@ public class TdTrain extends BaseEntity
     private String updateStaffid;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
-    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:MM:SS")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updateDate;
 
     /** 所属地市 */
@@ -88,8 +88,8 @@ public class TdTrain extends BaseEntity
     private Long trainState;
 
     /** 培训结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:MM:SS")
-    @Excel(name = "培训结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:MM:SS")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "培训结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date trainTimeend;
 
     /** 部门 */
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index cf315a5..8059bb9 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -98,8 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) ))
 		</if>
+
+		ORDER BY examinedate desc
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
+
 	</select>
 	
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
index 1e6de47..077fef0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTdLeaveVo">
-        select id, user_id, user_name, country, areaname, leavereason, depart, leavedate, workstate, leavestate, examinename, examinedate, examinestate from td_leave
+        select id, user_id, user_name, country, areaname, leavereason, depart, leavedate, workstate, leavestate, examinename, examinedate, examinestate from td_leave ORDER BY examinedate ASC
     </sql>
 
     <select id="selectTdLeaveList" parameterType="TdLeave" resultMap="TdLeaveResult">