bonus
/
jstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

This commit is contained in:
liang.chao 2025-12-09 13:42:20 +08:00
parent b039737472
commit b5c35c8a1f
6 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blade-service/blade-system/src/main/java/org/springblade/system/domain/TransferFileDto.java
View File

@ -19,7 +19,7 @@ public class TransferFileDto {
private Integer transferApplyId;
/**
* 项目匹配档案目录ID（关联 da_ky_pro_files_contents.id）
* 项目匹配档案目录ID（关联 record_da_ky_pro_files_contents.id）
*/
private String proFilesContentsId;

40
blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.system.mapper.FileManageMapper">
<insert id="saveFileManage" useGeneratedKeys="true" keyProperty="id">
INSERT INTO da_ky_pro_files_contents
INSERT INTO record_da_ky_pro_files_contents
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="proId != null and proId != ''">pro_id,</if>
@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
values (#{proId},#{deptId}, 0, now())
</insert>
<update id="updateFileManage">
UPDATE da_ky_pro_files_contents
UPDATE record_da_ky_pro_files_contents
<set>
<if test="contentName != null and contentName != ''">content_name = #{contentName},</if>
<if test="parentId != null and parentId != ''">parent_id = #{parentId},</if>
@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE business_id = #{id}
</update>
<update id="updateIntegrityStatus">
UPDATE da_ky_pro_files_contents
UPDATE record_da_ky_pro_files_contents
set
integrity_status = '1'
WHERE pro_id = #{proId}
@ -215,7 +215,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE business_id = #{id}
</delete>
<delete id="delFileManage">
DELETE FROM da_ky_pro_files_contents
DELETE FROM record_da_ky_pro_files_contents
WHERE id = #{id}
</delete>
<delete id="delRectification">
@ -228,8 +228,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkp.*,
COALESCE(dkp2.content_name, dkp.content_name) AS parentName
FROM
da_ky_pro_files_contents dkp
LEFT JOIN da_ky_pro_files_contents dkp2
record_da_ky_pro_files_contents dkp
LEFT JOIN record_da_ky_pro_files_contents dkp2
ON dkp.parent_id = dkp2.id
AND dkp2.del_flag = '1'
AND dkp2.pro_id = #{proId}
@ -266,7 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkfs.source_file_name AS sourceFileName,
dkfs.create_user_name AS createUserName
FROM
da_ky_pro_files_contents dkpfc
record_da_ky_pro_files_contents dkpfc
left join da_ky_sys_file_source dkfs on dkpfc.id = dkfs.business_id
left join blade_dept bd on dkpfc.unit_name = bd.id
WHERE
@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
count(*)
FROM
da_ky_pro_files_contents
record_da_ky_pro_files_contents
WHERE content_name = #{contentName}
and parent_id = #{parentId}
and del_flag = '1'
@ -296,7 +296,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
max(dkpfc.sort)
FROM
da_ky_pro_files_contents dkpfc
record_da_ky_pro_files_contents dkpfc
WHERE
dkpfc.del_flag = '1' and dkpfc.parent_id = #{parentId}
</select>
@ -305,7 +305,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
dkp.level
FROM
da_ky_pro_files_contents dkp
record_da_ky_pro_files_contents dkp
WHERE
dkp.id = #{parentId} and dkp.pro_id = #{proId}
</select>
@ -313,7 +313,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
dkpfc.sort
FROM
da_ky_pro_files_contents dkpfc
record_da_ky_pro_files_contents dkpfc
WHERE
dkpfc.id = #{id}
</select>
@ -341,7 +341,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dksdd.dict_label AS markCode,
dkfcm.classify_mark_name AS classifyMarkName
FROM
da_ky_pro_files_contents dkpfc
record_da_ky_pro_files_contents dkpfc
LEFT JOIN da_ky_sys_dict_data dksdd ON dkpfc.mark_code = dksdd.dict_value
AND dksdd.dict_type = 'mark_code'
LEFT JOIN record_da_ky_files_classify_mark dkfcm ON dkpfc.classify_mark = dkfcm.id
@ -356,7 +356,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
count(dkfs.id)
FROM
da_ky_sys_file_source dkfs
record_da_ky_pro_files_contents dkfs
left join da_ky_pro_files_contents dkpfc on dkfs.business_id = dkpfc.id
WHERE dkfs.del_flag = '1' and dkpfc.level = 5 and dkpfc.pro_id = #{proId}
</select>
@ -364,8 +364,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
count(dkpfc.id)
FROM
da_ky_pro_files_contents dkpfc
left join da_ky_pro_files_contents dkpfc2 on dkpfc.parent_id = dkpfc2.id
record_da_ky_pro_files_contents dkpfc
left join record_da_ky_pro_files_contents dkpfc2 on dkpfc.parent_id = dkpfc2.id
WHERE
dkpfc.del_flag = '1' and dkpfc2.id = #{id}
</select>
@ -381,10 +381,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from record_rectification_list rrl
left join da_ky_project dkp on rrl.pro_id = dkp.id
left join da_ky_sys_file_source dksfs on rrl.file_id = dksfs.id
left join da_ky_pro_files_contents dkpfc on dkpfc.id = dksfs.business_id
left join da_ky_pro_files_contents dkpfc2 on dkpfc.parent_id = dkpfc2.id
left join da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
left join da_ky_pro_files_contents dkpfc4 on dkpfc3.parent_id = dkpfc4.id
left join record_da_ky_pro_files_contents dkpfc on dkpfc.id = dksfs.business_id
left join record_da_ky_pro_files_contents dkpfc2 on dkpfc.parent_id = dkpfc2.id
left join record_da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
left join record_da_ky_pro_files_contents dkpfc4 on dkpfc3.parent_id = dkpfc4.id
WHERE rrl.pro_id = #{proId} and dkpfc.pro_id = #{proId} and dkpfc2.pro_id = #{proId} and dkpfc3.pro_id = #{proId} and dkpfc4.pro_id = #{proId}
<if test="contentName != null and contentName != ''">
and concat( dkpfc4.content_name, '/', dkpfc3.content_name, '/', dkpfc2.content_name, '/', dkpfc.content_name, '/', dksfs.file_name ) like concat('%', #{contentName}, '%')
@ -398,7 +398,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getdeptIds" resultType="java.lang.String">
SELECT
unit_name
from da_ky_pro_files_contents where pro_id = #{proId} and level = 5 and del_flag = '1'
from record_da_ky_pro_files_contents where pro_id = #{proId} and level = 5 and del_flag = '1'
</select>
<select id="transferAuditDetail" resultType="org.springblade.system.domain.RectificationDto">
select bd.dept_name AS deptName,

2
blade-service/blade-system/src/main/java/org/springblade/system/mapper/FilesClassifyMarkMapper.xml
View File

@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
COUNT(1)
FROM
da_ky_pro_files_contents
record_da_ky_pro_files_contents
WHERE
del_flag = '1'
AND

2
blade-service/blade-system/src/main/java/org/springblade/system/mapper/ProjectMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.system.mapper.ProjectMapper">
<insert id="insertDakyProFilesContents">
INSERT INTO da_ky_pro_files_contents
INSERT INTO record_da_ky_pro_files_contents
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="proId != null and proId != ''">pro_id,</if>

10
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RectFeedbackMapper.xml
View File

@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from record_rectification_list rrl
left join da_ky_project dkp on rrl.pro_id = dkp.id
left join da_ky_sys_file_source dksfs on rrl.file_id = dksfs.id
left join da_ky_pro_files_contents dkpfc on dksfs.business_id = dkpfc.id
left join record_da_ky_pro_files_contents dkpfc on dksfs.business_id = dkpfc.id
left join blade_dept bd on bd.id = dkpfc.unit_name
WHERE 1=1
<if test="singleProName != null and singleProName != ''">
@ -53,10 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from record_rectification_list rrl
left join da_ky_project dkp on rrl.pro_id = dkp.id
left join da_ky_sys_file_source dksfs on rrl.file_id = dksfs.id
left join da_ky_pro_files_contents dkpfc on dkpfc.id = dksfs.business_id
left join da_ky_pro_files_contents dkpfc2 on dkpfc.parent_id = dkpfc2.id
left join da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
left join da_ky_pro_files_contents dkpfc4 on dkpfc3.parent_id = dkpfc4.id
left join record_da_ky_pro_files_contents dkpfc on dkpfc.id = dksfs.business_id
left join record_da_ky_pro_files_contents dkpfc2 on dkpfc.parent_id = dkpfc2.id
left join record_da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
left join record_da_ky_pro_files_contents dkpfc4 on dkpfc3.parent_id = dkpfc4.id
left join blade_dept bd on bd.id = dkpfc.unit_name
left join blade_user bu on bu.id = rrl.issue_user
WHERE rrl.pro_id = #{proId} and dkpfc.pro_id = #{proId} and dkpfc2.pro_id = #{proId} and dkpfc3.pro_id = #{proId} and dkpfc4.pro_id = #{proId}

50
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml
View File

@ -462,10 +462,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkpfc1.content_name AS parentName,
dktf.transfer_time AS transferTime,
dktf.receive_status AS receiveStatus
FROM da_ky_pro_files_contents dkpfc
left join da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
FROM record_da_ky_pro_files_contents dkpfc
left join record_da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join record_da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join record_da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
LEFT JOIN da_ky_sys_file_source dkfs ON dkpfc.id = dkfs.business_id
LEFT JOIN da_ky_transfer_file dktf ON dkfs.id = dktf.file_source_id
left join da_ky_project dkp on dkp.id = dktf.pro_id
@ -493,7 +493,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
id,
pro_id,
level
FROM da_ky_pro_files_contents
FROM record_da_ky_pro_files_contents
WHERE id = #{id}
AND pro_id = #{proId}
@ -503,7 +503,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
c.id,
c.pro_id,
c.level
FROM da_ky_pro_files_contents c
FROM record_da_ky_pro_files_contents c
INNER JOIN sub_tree st ON c.parent_id = st.id
WHERE c.level &lt;= 4
AND c.pro_id = #{proId}
@ -542,10 +542,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkfs.source_file_name AS sourceFileName,
dkfs.create_user_name AS createUserName
FROM
da_ky_pro_files_contents dkpfc
left join da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
record_da_ky_pro_files_contents dkpfc
left join record_da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join record_da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join record_da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
LEFT JOIN da_ky_sys_file_source dkfs ON dkpfc.id = dkfs.business_id
LEFT JOIN da_ky_transfer_file fs ON dkfs.id = fs.file_source_id
WHERE
@ -566,10 +566,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
da_ky_transfer_file dktf
left join da_ky_sys_file_source dkfs ON dktf.file_source_id = dkfs.id
LEFT JOIN da_ky_pro_files_contents dkpfc ON dktf.pro_files_contents_id = dkpfc.id
LEFT JOIN da_ky_pro_files_contents dkpfc1 ON dkpfc.parent_id = dkpfc1.id
LEFT JOIN da_ky_pro_files_contents dkpfc2 ON dkpfc1.parent_id = dkpfc2.id
LEFT JOIN da_ky_pro_files_contents dkpfc3 ON dkpfc2.parent_id = dkpfc3.id
LEFT JOIN record_da_ky_pro_files_contents dkpfc ON dktf.pro_files_contents_id = dkpfc.id
LEFT JOIN record_da_ky_pro_files_contents dkpfc1 ON dkpfc.parent_id = dkpfc1.id
LEFT JOIN record_da_ky_pro_files_contents dkpfc2 ON dkpfc1.parent_id = dkpfc2.id
LEFT JOIN record_da_ky_pro_files_contents dkpfc3 ON dkpfc2.parent_id = dkpfc3.id
WHERE
dktf.transfer_apply_id = #{transferApplyId} and dktf.pro_id = dkpfc3.pro_id
</select>
@ -612,10 +612,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkfs.source_file_name AS sourceFileName,
dkfs.create_user_name AS createUserName
FROM
da_ky_pro_files_contents dkpfc
left join da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
record_da_ky_pro_files_contents dkpfc
left join record_da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join record_da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join record_da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
LEFT JOIN da_ky_sys_file_source dkfs ON dkpfc.id = dkfs.business_id
LEFT JOIN da_ky_transfer_file fs ON dkfs.id = fs.file_source_id
left join da_ky_transfer_apply tfs on tfs.id = fs.transfer_apply_id
@ -677,7 +677,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
COUNT(*)
FROM
da_ky_sys_file_source dksfs
LEFT JOIN da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id
LEFT JOIN record_da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id
WHERE
dkpfc.pro_id = #{proId}
@ -696,7 +696,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dksfs.id
FROM
da_ky_sys_file_source dksfs
LEFT JOIN da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id
LEFT JOIN record_da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id
WHERE
dkpfc.pro_id = #{proId}
@ -716,7 +716,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dksfs.id
FROM
da_ky_sys_file_source dksfs
LEFT JOIN da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id
LEFT JOIN record_da_ky_pro_files_contents dkpfc ON dksfs.business_id = dkpfc.id
WHERE
dkpfc.pro_id = #{proId}
@ -759,10 +759,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkfs.source_file_name AS sourceFileName,
dkfs.create_user_name AS createUserName
FROM
da_ky_pro_files_contents dkpfc
left join da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
record_da_ky_pro_files_contents dkpfc
left join record_da_ky_pro_files_contents dkpfc1 on dkpfc.parent_id = dkpfc1.id
left join record_da_ky_pro_files_contents dkpfc2 on dkpfc1.parent_id = dkpfc2.id
left join record_da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id
LEFT JOIN da_ky_sys_file_source dkfs ON dkpfc.id = dkfs.business_id
LEFT JOIN da_ky_transfer_file fs ON dkfs.id = fs.file_source_id
WHERE