代码提交

bonus-admin/src/main/java/com/bonus/web/controller/archive/FilesClassifyMarkController.java

@@ -69,12 +69,7 @@ public class FilesClassifyMarkController extends BaseController {
             if (isUse > 0) {
                 return R.fail("该分类标记正在被使用，请勿修改");
             }
-            Integer i = service.edit(dto);
+            return service.edit(dto);
-            if (i > 0) {
-                return R.ok();
-            } else {
-                return R.fail("修改失败");
-            }
         } catch (Exception e) {
             log.error(e.toString(), e);
             return R.fail("请求出错了");

bonus-admin/src/main/java/com/bonus/web/domain/FilesClassifyNameStandardDto.java

@@ -13,6 +13,7 @@ import javax.validation.constraints.NotBlank;
 public class FilesClassifyNameStandardDto {
     private Integer id;
     private String standardType;
+    private String standardTypeName;
     @NotBlank(message = "文件分类命名规范不能为空")
     @Length(max = 32, message = "规范识别值长度不能超过32个字符")
     private String standardName;

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

@@ -22,4 +22,6 @@ public interface FilesClassifyMarkMapper {
     Integer getUseByFilesContents(String id);
 
     Integer getUseByProFilesContents(String id);
+
+    Integer isExit(FilesClassifyMarkDto dto);
 }

bonus-admin/src/main/java/com/bonus/web/service/FilesClassifyMarkService.java

@@ -15,7 +15,7 @@ public interface FilesClassifyMarkService {
 
     R add(FilesClassifyMarkDto dto);
 
-    Integer edit(FilesClassifyMarkDto dto);
+    R edit(FilesClassifyMarkDto dto);
 
     Integer del(FilesClassifyMarkDto dto);
 

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

@@ -21,6 +21,7 @@ public class FilesClassifyMarkServiceImpl implements FilesClassifyMarkService {
 
     @Autowired
     private FilesClassifyMarkMapper filesClassifyMarkMapper;
+
     @Override
     public List<FilesClassifyMarkDto> list(FilesClassifyMarkDto dto) {
         return filesClassifyMarkMapper.list(dto);
@@ -29,7 +30,7 @@ public class FilesClassifyMarkServiceImpl implements FilesClassifyMarkService {
     @Override
     public R add(FilesClassifyMarkDto dto) {
         List<FilesClassifyMarkDto> list = filesClassifyMarkMapper.list(dto);
-        if (list.size() > 0){
+        if (list.size() > 0) {
             return R.fail("该分类标记已存在");
         }
         dto.setCreateUserId(getLoginUser().getUserId().toString());
@@ -37,17 +38,26 @@ public class FilesClassifyMarkServiceImpl implements FilesClassifyMarkService {
         dto.setUpdateUserId(getLoginUser().getUserId().toString());
         dto.setUpdateUserName(getLoginUser().getUsername());
         Integer add = filesClassifyMarkMapper.add(dto);
-        if (add <= 0){
+        if (add <= 0) {
             return R.fail("添加失败");
         }
         return R.ok();
     }
 
     @Override
-    public Integer edit(FilesClassifyMarkDto dto) {
+    public R edit(FilesClassifyMarkDto dto) {
+        Integer isExit = filesClassifyMarkMapper.isExit(dto);
+        if (isExit > 0) {
+            return R.fail("文件分类标记名称已存在");
+        }
         dto.setUpdateUserId(getLoginUser().getUserId().toString());
         dto.setUpdateUserName(getLoginUser().getUsername());
-        return filesClassifyMarkMapper.edit(dto);
+        Integer edit = filesClassifyMarkMapper.edit(dto);
+        if (edit > 0) {
+            return R.ok();
+        } else {
+            return R.fail("修改失败");
+        }
     }
 
     @Override
@@ -59,9 +69,9 @@ public class FilesClassifyMarkServiceImpl implements FilesClassifyMarkService {
     public Integer isUseByFilesContents(String id) {
         Integer useByFilesContents = filesClassifyMarkMapper.getUseByFilesContents(id);
         Integer useByProFilesContents = filesClassifyMarkMapper.getUseByProFilesContents(id);
-        if (useByFilesContents > 0 || useByProFilesContents > 0){
+        if (useByFilesContents > 0 || useByProFilesContents > 0) {
             return 1;
-        }else {
+        } else {
             return 0;
         }
     }

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

@@ -82,4 +82,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		AND
 			classify_mark = #{id}
 	</select>
+	<select id="isExit" resultType="java.lang.Integer">
+		SELECT COUNT(*)
+		FROM da_ky_files_classify_mark
+		WHERE classify_mark_name = #{classifyMarkName}
+		AND id != #{id}
+		AND del_flag = 1
+	</select>
 </mapper>

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

@@ -51,7 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getClassifyNameStandardList" resultType="com.bonus.web.domain.FilesClassifyNameStandardDto">
 		SELECT
 			dkfcns.id,
-			dksdd.dict_label AS standardType,
+			dksdd.dict_value AS standardType,
+			dksdd.dict_label AS standardTypeName,
 			dkfcns.standard_name AS standardName,
 			dkfcns.remark,
 			dkfcns.create_time AS createTime,

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

@@ -294,7 +294,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		UPDATE da_ky_transfer_file
 		SET transfer_status = #{transferStatus},
 			transfer_time = now()
-		WHERE id = #{id}
+		WHERE file_source_id = #{id}
 	</update>
 	<update id="setTransferTime">
 		UPDATE da_ky_transfer_apply
@@ -567,7 +567,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				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
 		WHERE
-			dktf.transfer_apply_id = #{transferApplyId}
+			dktf.transfer_apply_id = #{transferApplyId} and dktf.pro_id = dkpfc3.pro_id
 	</select>
 	<select id="getProNameById" resultType="java.lang.String">
 		SELECT