diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/domain/TransferFileDto.java b/blade-service/blade-system/src/main/java/org/springblade/system/domain/TransferFileDto.java index ad4a7a0..20682d0 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/domain/TransferFileDto.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/domain/TransferFileDto.java @@ -14,7 +14,7 @@ public class TransferFileDto { private Integer id; /** - * 档案移交申请ID(外键关联 da_ky_transfer_apply.id) + * 档案移交申请ID(外键关联 record_da_ky_transfer_apply.id) */ private Integer transferApplyId; diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml index 2ff14ef..117ff32 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml @@ -124,7 +124,7 @@ INNER JOIN DeptTree dt ON d.parent_id = dt.id ) SELECT COUNT(*) - FROM da_ky_transfer_apply t + FROM record_da_ky_transfer_apply t INNER JOIN DeptTree dt ON t.id = dt.id WHERE t.del_flag = '1' diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/SysDeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/SysDeptMapper.xml index 00c0ca9..019515d 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/SysDeptMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/SysDeptMapper.xml @@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INNER JOIN DeptTree dt ON d.parent_id = dt.dept_id ) SELECT COUNT(*) - FROM da_ky_transfer_apply t + FROM record_da_ky_transfer_apply t INNER JOIN DeptTree dt ON t.dept_id = dt.dept_id WHERE t.del_flag = '1' diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml index 4194435..f5a08bb 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - INSERT INTO da_ky_transfer_apply + INSERT INTO record_da_ky_transfer_apply pro_id, @@ -211,7 +211,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - UPDATE da_ky_transfer_apply + UPDATE record_da_ky_transfer_apply pro_id = #{proId}, @@ -259,7 +259,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} - UPDATE da_ky_transfer_apply + UPDATE record_da_ky_transfer_apply audit_status = #{auditStatus}, @@ -286,7 +286,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} - UPDATE da_ky_transfer_apply + UPDATE record_da_ky_transfer_apply SET transfer_status = '1' WHERE id = #{transferApplyId} @@ -297,12 +297,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE file_source_id = #{id} - UPDATE da_ky_transfer_apply + UPDATE record_da_ky_transfer_apply SET transfer_time = now() WHERE id = #{transferApplyId} - UPDATE da_ky_transfer_apply + UPDATE record_da_ky_transfer_apply SET receive_status = '1' WHERE id = #{transferApplyId} @@ -316,7 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE transfer_apply_id = #{id} - DELETE FROM da_ky_transfer_apply + DELETE FROM record_da_ky_transfer_apply WHERE id = #{id} @@ -361,7 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dkta.update_user_name AS updateUserName, dkta.update_user_id AS updateUserId, dkta.del_flag AS delFlag - FROM da_ky_transfer_apply dkta + FROM record_da_ky_transfer_apply dkta left join record_da_ky_project dkp on dkta.pro_id = dkp.id LEFT JOIN blade_dept d ON dkta.dept_id = d.id AND d.is_deleted = '0' where dkta.del_flag = '1' @@ -403,7 +403,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dept_name AS full_path, 0 AS level FROM blade_dept - WHERE id = (SELECT dept_id FROM da_ky_transfer_apply WHERE id = #{id}) + WHERE id = (SELECT dept_id FROM record_da_ky_transfer_apply WHERE id = #{id}) UNION ALL @@ -431,7 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ELSE '' END AS auditStatus FROM DeptTree dt - CROSS JOIN da_ky_transfer_apply dkta + CROSS JOIN record_da_ky_transfer_apply dkta WHERE dkta.del_flag = '1' AND dkta.id = #{id} @@ -618,7 +618,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join record_da_ky_pro_files_contents dkpfc3 on dkpfc2.parent_id = dkpfc3.id LEFT JOIN record_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 + left join record_da_ky_transfer_apply tfs on tfs.id = fs.transfer_apply_id WHERE dkpfc.del_flag = '1' and fs.transfer_apply_id = #{id} @@ -653,7 +653,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT transfer_time AS transferTime FROM - da_ky_transfer_apply + record_da_ky_transfer_apply WHERE id = #{transferApplyId}