From bcd9280ee6197ffafa01904d319de9d13d64fb6c Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Wed, 5 Jun 2024 10:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dkingbase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/kingbase_trouble                               |  1 -
 .../resources/templates/system/train/detail.html   |  4 +++-
 .../main/java/com/ruoyi/system/domain/TdCheck.java |  4 ++++
 .../main/resources/mapper/system/SysPostMapper.xml | 14 +++++++-------
 .../resources/mapper/system/SysUserPostMapper.xml  |  8 ++++----
 .../mapper/system/TdFileReceiveMapper.xml          | 10 +++++-----
 6 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/doc/kingbase_trouble b/doc/kingbase_trouble
index 25436fc..fb7d7d1 100644
--- a/doc/kingbase_trouble
+++ b/doc/kingbase_trouble
@@ -1,4 +1,3 @@
 1.系统工具——————代码生成
 2.涉密人员统计——————打印
-3.检查结果管理——————报告人单位
 4.文件管理若干问题
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/detail.html b/ruoyi-admin/src/main/resources/templates/system/train/detail.html
index e829d9c..8d3ff6b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/detail.html
@@ -92,7 +92,9 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">培训状态：</label>
             <div class="col-sm-8">
-                <input name="trainState" disabled th:field="*{trainState}" class="form-control" type="text">
+                <select name="trainState" disabled required class="form-control m-b" th:with="type=${@dict.getType('sys_examine_state')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{trainState}"></option>
+                </select>
             </div>
         </div>
         <div class="form-group">
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java
index 61b2d7b..d159835 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TdCheck.java
@@ -28,6 +28,10 @@ public class TdCheck extends BaseEntity
     @Excel(name = "单位")
     private String depart;
 
+    public void setDepart(String depart) {
+        this.depart = depart;
+    }
+
     /** 检查开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "检查开始时间", width = 30, dateFormat = "yyyy-MM-dd")
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
index 547eaf4..eb977b4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectPostVo">
         select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark 
-		from sys_post
+		from zhky."public".sys_post
     </sql>
 	
 	<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectPostsByUserId" parameterType="Long" resultMap="SysPostResult">
 		SELECT p.post_id, p.post_name, p.post_code
-		FROM sys_user u
-			 LEFT JOIN sys_user_post up ON u.user_id = up.user_id
-			 LEFT JOIN sys_post p ON up.post_id = p.post_id
+		FROM zhky."public".sys_user u
+			 LEFT JOIN zhky."public".sys_user_post up ON u.user_id = up.user_id
+			 LEFT JOIN zhky."public".sys_post p ON up.post_id = p.post_id
 		WHERE up.user_id = #{userId}
 	</select>
 	
@@ -65,14 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
  	<delete id="deletePostByIds" parameterType="Long">
- 		delete from sys_post where post_id in
+ 		delete from zhky."public".sys_post where post_id in
  		<foreach collection="array" item="postId" open="(" separator="," close=")">
  			#{postId}
         </foreach> 
  	</delete>
  	
  	<update id="updatePost" parameterType="SysPost">
- 		update sys_post
+ 		update zhky."public".sys_post
  		<set>
  			<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
  			<if test="postName != null and postName != ''">post_name = #{postName},</if>
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
  	
  	<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
- 		insert into sys_post(
+ 		insert into zhky."public".sys_post(
  			<if test="postId != null and postId != 0">post_id,</if>
  			<if test="postCode != null and postCode != ''">post_code,</if>
  			<if test="postName != null and postName != ''">post_name,</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index 2b90bc4..03c9b9a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -10,22 +10,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<delete id="deleteUserPostByUserId" parameterType="Long">
-		delete from sys_user_post where user_id=#{userId}
+		delete from zhky."public".sys_user_post where user_id=#{userId}
 	</delete>
 	
 	<select id="countUserPostById" resultType="Integer">
-	    select count(1) from sys_user_post where post_id=#{postId}  
+	    select count(1) from zhky."public".sys_user_post where post_id=#{postId}
 	</select>
 	
 	<delete id="deleteUserPost" parameterType="Long">
- 		delete from sys_user_post where user_id in
+ 		delete from zhky."public".sys_user_post where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
         </foreach> 
  	</delete>
 	
 	<insert id="batchUserPost">
-		insert into sys_user_post(user_id, post_id) values
+		insert into zhky."public".sys_user_post(user_id, post_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
 			(#{item.userId},#{item.postId})
 		</foreach>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
index 56a1854..6cc9440 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdFileReceiveMapper.xml
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTdFileReceiveVo">
-        select receive_id, file_id, file_name, provide_depart, provide_date, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state,destory_address, destory_depart, destory_username, destory_style, destory_count, destory_date, remark from td_file_receive
+        select receive_id, file_id, file_name, provide_depart, provide_date, receive_departid, receive_state, receive_userid, receive_date, extract_state, extract_departid, extract_userid, extract_date, destory_state,destory_address, destory_depart, destory_username, destory_style, destory_count, destory_date, remark from zhky."public".td_file_receive
     </sql>
 
     <select id="selectTdFileReceiveList" parameterType="TdFileReceive" resultMap="TdFileReceiveResult">
@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTdFileReceive" parameterType="TdFileReceive" useGeneratedKeys="true" keyProperty="receiveId">
-        insert into td_file_receive
+        insert into zhky."public".td_file_receive
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="fileId != null">file_id,</if>
             <if test="fileName != null">file_name,</if>
@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateTdFileReceive" parameterType="TdFileReceive">
-        update td_file_receive
+        update zhky."public".td_file_receive
         <trim prefix="SET" suffixOverrides=",">
             <if test="fileId != null">file_id = #{fileId},</if>
             <if test="fileName != null">file_name = #{fileName},</if>
@@ -150,11 +150,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteTdFileReceiveByReceiveId" parameterType="Long">
-        delete from td_file_receive where receive_id = #{receiveId}
+        delete from zhky."public".td_file_receive where receive_id = #{receiveId}
     </delete>
 
     <delete id="deleteTdFileReceiveByReceiveIds" parameterType="String">
-        delete from td_file_receive where receive_id in 
+        delete from zhky."public".td_file_receive where receive_id in
         <foreach item="receiveId" collection="array" open="(" separator="," close=")">
             #{receiveId}
         </foreach>