From c16a867c943e25a25d64f02fb95e755ef1a7c9f9 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Mon, 30 Sep 2024 18:03:25 +0800
Subject: [PATCH] 1、审核过程中申请记录的申请时间和申请人无法查看 2、审核联合处置申请在申请部门已办结后会报错，且无法继续审核 3、案件不予受理后在已办中无记录 4、上报的案件上级部门回退后下级部门接收不到 5、广州市综治中心纠纷依然可以选择上报，且点击上报后报错
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileInfoMapper.xml | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileInfoMapper.xml b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileInfoMapper.xml
index f789de2..4eeadd0 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileInfoMapper.xml
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileInfoMapper.xml
@@ -303,31 +303,42 @@
</select>
<!-- 根据多个编号查询 -->
- <select id="listByids" resultMap="fileResult">
+ <select id="listFile" resultMap="fileResult">
SELECT t2.owner_id, t2.owner_cat, t2.owner_type, t2.uploader_id, t2.uploader_name,
<include refid="column-part-t"/>
FROM dyh_file_info t1
LEFT JOIN dyh_file_relate t2 ON t1.id = t2.file_id
- WHERE t2.main_id = #{mainId}
- <if test="terms.ownerIds = null and terms.ownerIds =''">
- and t2.owner_id in (${ownerIds})
+ WHERE
+ t1.delete_status = 0
+ and t2.main_id = #{terms.mainId}
+ <if test="terms.ownerIds != null and terms.ownerIds !=''">
+ and t2.owner_id in (${terms.ownerIds})
</if>
- <if test="terms.types = null and terms.types =''">
- and t2.owner_type in (${types})
+ <if test="terms.types != null and terms.types !=''">
+ and t2.owner_type in (${terms.types})
</if>
-
-
-
</select>
- <!-- 根据多个编号查询 -->
- <select id="listByIdsTypes" resultMap="fileResult">
+ <select id="listFileByType" resultMap="fileResult">
SELECT t2.owner_id, t2.owner_cat, t2.owner_type, t2.uploader_id, t2.uploader_name,
<include refid="column-part-t"/>
FROM dyh_file_info t1
LEFT JOIN dyh_file_relate t2 ON t1.id = t2.file_id
- WHERE t2.owner_id in (${ownerIds})
- and t2.main_id = #{mainId}
- and t2.owner_type in (${types})
+ WHERE
+ t1.delete_status = 0
+ and t2.main_id = #{terms.mainId}
+ and t2.owner_type = #{terms.ownerType}
</select>
+
+
+<!-- <!– 根据多个编号查询 –>-->
+<!-- <select id="listByIdsTypes" resultMap="fileResult">-->
+<!-- SELECT t2.owner_id, t2.owner_cat, t2.owner_type, t2.uploader_id, t2.uploader_name,-->
+<!-- <include refid="column-part-t"/>-->
+<!-- FROM dyh_file_info t1-->
+<!-- LEFT JOIN dyh_file_relate t2 ON t1.id = t2.file_id-->
+<!-- WHERE t2.owner_id in (${ownerIds})-->
+<!-- and t2.main_id = #{mainId}-->
+<!-- and t2.owner_type in (${types})-->
+<!-- </select>-->
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0