代码提交

blade-service/blade-system/src/main/java/org/springblade/system/controller/FileManagementController.java

@@ -84,6 +84,15 @@ public class FileManagementController extends BaseController {
             return getDataTable(new ArrayList<>());
         }
     }
+    @PostMapping("getProjectNameById")
+    public AjaxResult getProjectNameById(@RequestBody ProjectDto dto) {
+        try {
+            return AjaxResult.success(service.getProjectNameById(dto));
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            return AjaxResult.error("请求出错了");
+        }
+    }
 
     @PostMapping("getFileManageTree")
     @SysLog(title = "档案管理树", module = "档案管理->档案左侧树", businessType = OperaType.QUERY, details = "档案管理树", logType = 1)
@@ -370,6 +379,10 @@ public class FileManagementController extends BaseController {
     @RequiresPermissions("file:manage:confirm")
     public R updateIntegrityStatus(@RequestBody DaKyProFilesContentsDto dto) {
         try {
+			// 该工程下若存在整改文件，则不能进行移交
+			if (fileManageMapper.getRectificationFile(dto) > 0) {
+				return R.fail("该工程下存在整改文件，请先处理整改文件");
+			}
             Integer i = fileManageService.updateIntegrityStatus(dto);
             if (i > 0) {
                 return R.ok();

blade-service/blade-system/src/main/java/org/springblade/system/mapper/FileManageMapper.java

@@ -62,4 +62,6 @@ public interface FileManageMapper {
 	Integer delRectification(RectificationDto dto);
 
 	Integer issue(RectificationDto dto);
+
+	Integer getRectificationFile(DaKyProFilesContentsDto dto);
 }

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

@@ -302,7 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getchild" resultType="java.lang.Integer">
 		SELECT
 			count(dkpfc.id)
-		FROM·
+		FROM
 			da_ky_pro_files_contents dkpfc
 		left join da_ky_pro_files_contents dkpfc2 on dkpfc.parent_id = dkpfc2.id
 		WHERE
@@ -329,4 +329,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and concat( dkpfc4.content_name, '/', dkpfc3.content_name, '/', dkpfc2.content_name, '/', dkpfc.content_name, '/', dksfs.file_name ) like concat('%', #{contentName}, '%')
         </if>
     </select>
+    <select id="getRectificationFile" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        from record_rectification_list where pro_id = #{proId} and rectify_status != 1
+    </select>
 </mapper>

blade-service/blade-system/src/main/java/org/springblade/system/mapper/ProjectMapper.java

@@ -23,4 +23,6 @@ public interface ProjectMapper {
     List<ArchivalCatalogueDto> getfilesContentsById(ProjectDto projectDto);
 
     Integer updateFileStatus(DaKyProFilesContentsDto dto);
+
+	ProjectDto getProjectNameById(ProjectDto dto);
 }

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

@@ -146,4 +146,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		)
 		SELECT * FROM child_nodes ORDER BY id asc
 	</select>
+    <select id="getProjectNameById" resultType="org.springblade.system.domain.ProjectDto">
+        SELECT
+            dkp.pro_name
+        FROM
+            da_ky_project dkp
+        WHERE
+            dkp.id = #{id}
+    </select>
+
 </mapper>

blade-service/blade-system/src/main/java/org/springblade/system/service/ProjectService.java

@@ -18,4 +18,6 @@ public interface ProjectService {
     List<SelectDto> getFileCatalogSelect();
 
     AjaxResult updateContentsName(ProjectDto projectDto);
+
+	ProjectDto getProjectNameById(ProjectDto dto);
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/ProjectServiceImpl.java

@@ -75,4 +75,9 @@ public class ProjectServiceImpl implements ProjectService {
         }
 
     }
+
+	@Override
+	public ProjectDto getProjectNameById(ProjectDto dto) {
+		return projectMapper.getProjectNameById(dto);
+	}
 }