项目代码提交

bonus-admin/src/main/java/com/bonus/web/mapper/FilesClassifyMarkMapper.java

@@ -12,6 +12,7 @@ import java.util.List;
 @Mapper
 public interface FilesClassifyMarkMapper {
     List<FilesClassifyMarkDto> list(FilesClassifyMarkDto dto);
+    List<FilesClassifyMarkDto> listByName(FilesClassifyMarkDto dto);
 
     Integer add(FilesClassifyMarkDto dto);
 

bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java

@@ -69,4 +69,6 @@ public interface TransferApplyMapper {
     Integer isAllReceiveByProject(TransferFileDto dto);
 
     Integer updateProjectFileStatus(TransferFileDto dto);
+
+    Integer delRecord(TransferApplyDto dto);
 }

bonus-admin/src/main/java/com/bonus/web/service/impl/FilesClassifyMarkServiceImpl.java

@@ -29,7 +29,7 @@ public class FilesClassifyMarkServiceImpl implements FilesClassifyMarkService {
 
     @Override
     public R add(FilesClassifyMarkDto dto) {
-        List<FilesClassifyMarkDto> list = filesClassifyMarkMapper.list(dto);
+        List<FilesClassifyMarkDto> list = filesClassifyMarkMapper.listByName(dto);
         if (list.size() > 0) {
             return R.fail("该分类标记已存在");
         }

bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java

@@ -98,6 +98,7 @@ public class TransferApplyServiceImpl implements TransferApplyService {
     public AjaxResult del(TransferApplyDto dto) {
         Integer i = transferApplyMapper.delTransferFiles(dto);
         if (i > 0) {
+            Integer i2 = transferApplyMapper.delRecord(dto);
             Integer i1 = transferApplyMapper.del(dto);
             return i1 > 0 ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
         } else {

bonus-admin/src/main/resources/mapper/FilesClassifyMarkMapper.xml

@@ -89,4 +89,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		AND id != #{id}
 		AND del_flag = 1
 	</select>
+	<select id="listByName" resultType="com.bonus.web.domain.FilesClassifyMarkDto">
+		SELECT
+		id,
+		classify_mark_name AS classifyMarkName,
+		remark,
+		create_time AS createTime,
+		update_time AS updateTime,
+		create_user_id AS createUserId,
+		create_user_name AS createUserName,
+		update_user_id AS updateUserId,
+		update_user_name AS updateUserName,
+		del_flag AS delFlag
+		FROM
+		da_ky_files_classify_mark
+		WHERE
+		del_flag = '1'
+			AND classify_mark_name = #{classifyMarkName}
+		ORDER BY
+		create_time DESC
+	</select>
 </mapper>

bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml

@@ -319,6 +319,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		DELETE FROM da_ky_transfer_apply
 		WHERE id = #{id}
 	</delete>
+	<delete id="delRecord">
+		DELETE FROM da_ky_transfer_audit_record
+		WHERE transfer_apply_id = #{id}
+	</delete>
 
 	<select id="list" resultType="com.bonus.web.domain.TransferApplyDto">
 		SELECT
@@ -470,6 +474,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				 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
 			where dktf.transfer_apply_id = #{id}
+			and dkpfc3.pro_id = #{proId} and dkpfc2.pro_id = #{proId} and dkpfc1.pro_id = #{proId} and dkpfc.pro_id = #{proId}
 	</select>
 	<select id="getDeptSelect" resultType="com.bonus.common.core.domain.entity.SysDept">
         SELECT dept_id   AS deptId,
@@ -621,6 +626,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE
 			dkpfc.del_flag = '1' and
 			fs.transfer_apply_id = #{id}
+			and dkpfc3.pro_id = #{proId} and dkpfc2.pro_id = #{proId} and dkpfc1.pro_id = #{proId} and dkpfc.pro_id = #{proId}
 		  AND dkpfc.LEVEL = 5
 	</select>
 	<select id="isAllReceive" resultType="java.lang.Integer">