代码提交

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

@@ -21,6 +21,7 @@ import org.springblade.common.enums.OperaType;
 import org.springblade.common.utils.bean.FileDto;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.system.domain.DaKyProFilesContentsDto;
+import org.springblade.system.domain.RectificationDto;
 import org.springblade.system.domain.vo.DaKyProFilesContentsVo;
 import org.springblade.system.mapper.FileManageMapper;
 import org.springblade.system.service.FileManageService;
@@ -139,6 +140,23 @@ public class FileManagementController extends BaseController {
     public AjaxResult getFileManageById(@RequestBody DaKyProFilesContentsDto dto) {
         return AjaxResult.success(fileManageService.getFileManageById(dto));
     }
+    @PostMapping("addRectification")
+    @SysLog(title = "加入整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "加入整改清单", logType = 1)
+    @RequiresPermissions("file:manage:rectification")
+    public AjaxResult addRectification(@RequestBody @Validated RectificationDto dto) {
+        return fileManageService.addRectification(dto);
+    }
+    @PostMapping("selectRectificationList")
+    @SysLog(title = "加入整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "加入整改清单", logType = 1)
+    @RequiresPermissions("file:manage:rectification")
+    public TableDataInfo selectRectificationList(@RequestBody RectificationDto dto) {
+		// 直接使用 dto 中的分页参数
+		PageHelper.startPage(dto.getPageNum() != null ? dto.getPageNum() : 1,
+				dto.getPageSize() != null ? dto.getPageSize() : 10,
+				SqlUtil.escapeOrderBySql(dto.getOrderBy()))
+			.setReasonable(dto.getReasonable() != null ? dto.getReasonable() : true);
+        return getDataTable(fileManageService.selectRectificationList(dto));
+    }
 
     @PostMapping("addFileManageRight")
     @SysLog(title = "新增右侧档案树", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增右侧档案树", logType = 1)
@@ -347,10 +365,10 @@ public class FileManagementController extends BaseController {
     }
 
     /**
-     * 档案抽取(这里先不做，返回确认即可)
+     * 档案同步(这里先不做，返回确认即可)
      */
     @PostMapping("fileExtract")
-    @SysLog(title = "档案抽取", module = "档案管理->档案目录管理", businessType = OperaType.DELETE, details = "档案抽取", logType = 1)
+    @SysLog(title = "档案同步", module = "档案管理->档案目录管理", businessType = OperaType.DELETE, details = "档案抽取", logType = 1)
     @RequiresPermissions("file:manage:extract")
     public R fileExtract(@RequestBody DaKyProFilesContentsDto dto) {
         return R.ok();

blade-service/blade-system/src/main/java/org/springblade/system/domain/DaKyProFilesContentsDto.java

@@ -166,6 +166,7 @@ public class DaKyProFilesContentsDto extends PageDomain {
     private String uploadTime;
     private String proName;
     private String singleProName;
+    private String isRectification;
 
     private List<DaKyProFilesContentsDto> children = new ArrayList<>();
 }

blade-service/blade-system/src/main/java/org/springblade/system/domain/RectificationDto.java

@@ -0,0 +1,27 @@
+package org.springblade.system.domain;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+import org.springblade.common.core.page.PageDomain;
+
+/**
+ * @Author：liang.chao
+ * @Date：2025/12/2 - 13:41
+ */
+@Data
+public class RectificationDto extends PageDomain {
+	private String fileId;
+	private String proId;
+	@NotBlank(message = "不能为空")
+	@Length(max = 64, message = "整改描述不能超过64个字符")
+	private String description;
+	private String proName;
+	private String singleProName;
+	private String contentName;
+	private Long createUserId;
+	private String createTime;
+	private Long updateUserId;
+	private String updateTime;
+
+}

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

@@ -2,6 +2,7 @@ package org.springblade.system.mapper;
 
 import org.springblade.system.domain.DaKyProFilesContentsDto;
 import org.springblade.system.domain.FilesClassifyNameStandardDto;
+import org.springblade.system.domain.RectificationDto;
 import org.springblade.system.domain.vo.DaKyProFilesContentsVo;
 
 import java.util.List;
@@ -49,4 +50,10 @@ public interface FileManageMapper {
     Integer getFilesNum(String proId);
 
     Integer getchild(DaKyProFilesContentsDto dto);
+
+	Integer addRectification(RectificationDto dto);
+
+	Integer updateisRectification(String fileId);
+
+	List<RectificationDto> selectRectificationList(RectificationDto dto);
 }

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

@@ -81,6 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			now()
 		</trim>
 	</insert>
+    <insert id="addRectification">
+        insert into record_rectification_list (file_id,pro_id,description,create_user_id,create_time)
+        values (#{fileId}, #{proId}, #{description}, #{createUserId}, now())
+    </insert>
     <update id="updateFileManage">
 		UPDATE da_ky_pro_files_contents
 		<set>
@@ -123,6 +127,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			integrity_status = '1'
 		WHERE pro_id = #{proId}
 	</update>
+    <update id="updateisRectification">
+        UPDATE da_ky_sys_file_source
+        set
+            is_rectification = '1'
+        WHERE id = #{fileId}
+    </update>
     <delete id="delFileSource">
 		DELETE FROM da_ky_sys_file_source
 		WHERE business_id = #{id}
@@ -169,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		dkpfc.is_unique AS isUnique,
 		dkpfc.integrity_status AS integrityStatus,
 		dkfs.id AS fileId,
+        dkfs.is_rectification AS isRectification,
 		dkfs.file_name AS fileName,
 		dkfs.create_time AS createTime,
 		dkfs.source_file_name AS  sourceFileName,
@@ -276,4 +287,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE
 			dkpfc.del_flag = '1' and dkpfc2.id = #{id}
 	</select>
+    <select id="selectRectificationList" resultType="org.springblade.system.domain.RectificationDto">
+        SELECT
+            dkp.pro_name AS proName,
+            dkp.single_pro_name AS singleProName,
+            concat( dkpfc4.content_name, ' / ', dkpfc3.content_name, ' / ', dkpfc2.content_name, ' / ', dkpfc.content_name, ' / ', dksfs.file_name ) AS contentName,
+            rrl.description
+        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
+        WHERE rrl.pro_id = #{proId}
+    </select>
 </mapper>

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

@@ -1,7 +1,9 @@
 package org.springblade.system.service;
 
+import org.springblade.common.core.domain.AjaxResult;
 import org.springblade.common.core.domain.R;
 import org.springblade.system.domain.DaKyProFilesContentsDto;
+import org.springblade.system.domain.RectificationDto;
 import org.springblade.system.domain.vo.DaKyProFilesContentsVo;
 
 import java.util.List;
@@ -34,4 +36,8 @@ public interface FileManageService {
     DaKyProFilesContentsDto getFileManageById(DaKyProFilesContentsDto dto);
 
     DaKyProFilesContentsVo getFileById(Long id);
+
+	AjaxResult addRectification(RectificationDto dto);
+
+	List<RectificationDto> selectRectificationList(RectificationDto dto);
 }

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

@@ -1,9 +1,11 @@
 package org.springblade.system.service.impl;
 
 import jakarta.annotation.Resource;
+import org.springblade.common.core.domain.AjaxResult;
 import org.springblade.common.core.domain.R;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.system.domain.DaKyProFilesContentsDto;
+import org.springblade.system.domain.RectificationDto;
 import org.springblade.system.domain.vo.DaKyProFilesContentsVo;
 import org.springblade.system.mapper.FileManageMapper;
 import org.springblade.system.mapper.ProjectMapper;
@@ -132,4 +134,21 @@ public class FileManageServiceImpl implements FileManageService {
 	public DaKyProFilesContentsVo getFileById(Long id) {
 		return fileManageMapper.getFileById(id);
 	}
+
+	@Override
+	public AjaxResult addRectification(RectificationDto dto) {
+		dto.setCreateUserId(AuthUtil.getUser().getUserId());
+		fileManageMapper.updateisRectification(dto.getFileId());
+		Integer i = fileManageMapper.addRectification(dto);
+		if (i > 0) {
+			return AjaxResult.success("添加整改成功");
+		} else {
+			return AjaxResult.error("添加整改失败");
+		}
+	}
+
+	@Override
+	public List<RectificationDto> selectRectificationList(RectificationDto dto) {
+		return fileManageMapper.selectRectificationList(dto);
+	}
 }