bonus
/
jstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

This commit is contained in:
liang.chao 2025-12-03 16:30:23 +08:00
parent 4be2cff1a9
commit ae46ab4484
11 changed files with 251 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,17 +147,23 @@ public class FileManagementController extends BaseController {
return fileManageService.addRectification(dto);
}
@PostMapping("updateRectification")
@SysLog(title = "加入整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "修改整改清单", logType = 1)
@SysLog(title = "修改整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "修改整改清单", logType = 1)
@RequiresPermissions("file:manage:rectification")
public AjaxResult updateRectification(@RequestBody @Validated RectificationDto dto) {
return fileManageService.updateRectification(dto);
}
@PostMapping("delRectification")
@SysLog(title = "加入整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "删除整改清单", logType = 1)
@SysLog(title = "删除整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "删除整改清单", logType = 1)
@RequiresPermissions("file:manage:rectification")
public AjaxResult delRectification(@RequestBody RectificationDto dto) {
return fileManageService.delRectification(dto);
}
@PostMapping("issue")
@SysLog(title = "整改清单->整改下发", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "整改清单->整改下发", logType = 1)
@RequiresPermissions("file:manage:issue")
public AjaxResult issue(@RequestBody RectificationDto dto) {
return fileManageService.issue(dto);
}
@PostMapping("selectRectificationList")
@SysLog(title = "加入整改清单", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "加入整改清单", logType = 1)
@RequiresPermissions("file:manage:rectification")

68
blade-service/blade-system/src/main/java/org/springblade/system/controller/RectFeedbackController.java Normal file
View File

@ -0,0 +1,68 @@
package org.springblade.system.controller;
import com.github.pagehelper.PageHelper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.annotation.RequiresPermissions;
import org.springblade.common.annotation.SysLog;
import org.springblade.common.core.controller.BaseController;
import org.springblade.common.core.domain.AjaxResult;
import org.springblade.common.core.page.TableDataInfo;
import org.springblade.common.enums.OperaType;
import org.springblade.common.utils.sql.SqlUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.system.domain.ProjectDto;
import org.springblade.system.domain.RectificationDto;
import org.springblade.system.service.RectFeedbackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
/**
* @Author：liang.chao
* @Date：2025/12/3 - 14:15
* 整改反馈
*/
@RestController
@RequestMapping("/rectFeedback")
@Slf4j
@NonDS
public class RectFeedbackController extends BaseController {
@Resource
private RectFeedbackService service;
@PostMapping("list")
@SysLog(title = "整改反馈列表", module = "数据档案移交->整改反馈", businessType = OperaType.QUERY, details = "整改反馈列表", logType = 1)
@RequiresPermissions("rectify:feedback:list")
public TableDataInfo list(@RequestBody RectificationDto dto) {
try {
// 直接使用 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);
List<RectificationDto> list = service.list(dto);
return getDataTable(list);
} catch (Exception e) {
log.error(e.toString(), e);
return getDataTable(new ArrayList<>());
}
}
@PostMapping("detail")
@SysLog(title = "整改反馈列表", module = "数据档案移交->整改反馈", businessType = OperaType.QUERY, details = "整改反馈列表", logType = 1)
@RequiresPermissions("rectify:feedback:query")
public AjaxResult detail(@RequestBody RectificationDto dto) {
try {
RectificationDto detail = service.detail(dto);
return AjaxResult.success(detail);
} catch (Exception e) {
log.error(e.toString(), e);
return new AjaxResult(500, "请求出错了");
}
}
}

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

@ -12,9 +12,10 @@ import org.springblade.common.core.page.PageDomain;
@Data
public class RectificationDto extends PageDomain {
private String id;
private String[] ids;
private String fileId;
private String proId;
@NotBlank(message = "不能为空")
@NotBlank(message = "整改描述不能为空")
@Length(max = 64, message = "整改描述不能超过64个字符")
private String description;
private String proName;
@ -24,6 +25,21 @@ public class RectificationDto extends PageDomain {
private String createTime;
private Long updateUserId;
private String updateTime;
//是否加入整改清单（0否 1是）
private String isRectification;
// 是否下发（0未下发 1已下发）
private Integer isIssue;
// 下发时间
private String issueTime;
// 整改状态（0 整改中 1已通过 2已驳回）
private String rectifyStatus;
// 责任人单位
private String deptName;
// 下发人id
private String issueUser;
// 下发人姓名
private String issuerName;
// 下发人电话
private String issuerPhone;
}

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

@ -60,4 +60,6 @@ public interface FileManageMapper {
Integer updateRectification(RectificationDto dto);
Integer delRectification(RectificationDto dto);
Integer issue(RectificationDto dto);
}

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

@ -141,6 +141,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time = now()
WHERE id = #{id}
</update>
<update id="issue">
UPDATE record_rectification_list
set
is_issue = #{isIssue},
issue_time = now(),
issue_user = #{issueUser}
WHERE id = #{id}
</update>
<delete id="delFileSource">
DELETE FROM da_ky_sys_file_source
WHERE business_id = #{id}
@ -307,7 +315,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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
rrl.description,
rrl.is_issue AS isIssue
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
@ -316,5 +325,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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} and dkpfc.pro_id = #{proId} and dkpfc2.pro_id = #{proId} and dkpfc3.pro_id = #{proId} and dkpfc4.pro_id = #{proId}
<if test="contentName != null and contentName != ''">
and concat( dkpfc4.content_name, '/', dkpfc3.content_name, '/', dkpfc2.content_name, '/', dkpfc.content_name, '/', dksfs.file_name ) like concat('%', #{contentName}, '%')
</if>
</select>
</mapper>

15
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RectFeedbackMapper.java Normal file
View File

@ -0,0 +1,15 @@
package org.springblade.system.mapper;
import org.springblade.system.domain.RectificationDto;
import java.util.List;
/**
* @Author：liang.chao
* @Date：2025/12/3 - 14:19
*/
public interface RectFeedbackMapper {
List<RectificationDto> list(RectificationDto projectDto);
RectificationDto detail(RectificationDto dto);
}

55
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RectFeedbackMapper.xml Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.system.mapper.RectFeedbackMapper">
<select id="list" resultType="org.springblade.system.domain.RectificationDto">
SELECT
rrl.id,
rrl.file_id AS fileId,
dkp.id AS proId,
dkp.pro_name AS proName,
dkp.single_pro_name AS singleProName,
bd.dept_name AS deptName,
rrl.is_issue AS isIssue,
rrl.issue_time AS issueTime,
rrl.rectify_status AS rectifyStatus
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 dksfs.business_id = dkpfc.id
left join blade_dept bd on bd.id = dkpfc.unit_name
WHERE 1=1
<if test="proName != null and proName != ''">
and dkp.pro_name like concat('%',#{proName},'%')
</if>
<if test="rectifyStatus != null">
and rrl.rectify_status = #{rectifyStatus}
</if>
</select>
<select id="detail" resultType="org.springblade.system.domain.RectificationDto">
SELECT
rrl.id,
rrl.file_id AS fileId,
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,
bu.name AS issuerName,
bu.phone AS issuerPhone,
bd.dept_name AS deptName,
rrl.is_issue AS isIssue
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
left join blade_dept bd on bd.id = dkpfc.unit_name
left join blade_user bu on bu.id = rrl.issue_user
WHERE rrl.pro_id = #{proId} and dkpfc.pro_id = #{proId} and dkpfc2.pro_id = #{proId} and dkpfc3.pro_id = #{proId} and dkpfc4.pro_id = #{proId}
and rrl.id = #{id}
</select>
</mapper>

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

@ -43,4 +43,6 @@ public interface FileManageService {
List<RectificationDto> selectRectificationList(RectificationDto dto);
AjaxResult delRectification(RectificationDto dto);
AjaxResult issue(RectificationDto dto);
}

15
blade-service/blade-system/src/main/java/org/springblade/system/service/RectFeedbackService.java Normal file
View File

@ -0,0 +1,15 @@
package org.springblade.system.service;
import org.springblade.system.domain.RectificationDto;
import java.util.List;
/**
* @Author：liang.chao
* @Date：2025/12/3 - 14:17
*/
public interface RectFeedbackService {
List<RectificationDto> list(RectificationDto dto);
RectificationDto detail(RectificationDto dto);
}

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

@ -175,4 +175,31 @@ public class FileManageServiceImpl implements FileManageService {
return AjaxResult.error("移除失败");
}
}
@Override
public AjaxResult issue(RectificationDto dto) {
Integer i = 0;
if (dto != null) {
try {
for (String id : dto.getIds()) {
dto.setIsIssue(1);
dto.setId(id);
dto.setIssueUser(AuthUtil.getUser().getUserId().toString());
Integer result = fileManageMapper.issue(dto);
if (result != null) {
i += result;
}
}
} catch (Exception e) {
return AjaxResult.error("发布过程中发生异常：" + e.getMessage());
}
} else {
return AjaxResult.error("发布失败：没有数据需要处理");
}
if (i > 0) {
return AjaxResult.success("发布成功");
} else {
return AjaxResult.error("发布失败");
}
}
}

29
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RectFeedbackServiceImpl.java Normal file
View File

@ -0,0 +1,29 @@
package org.springblade.system.service.impl;
import jakarta.annotation.Resource;
import org.springblade.system.domain.RectificationDto;
import org.springblade.system.mapper.RectFeedbackMapper;
import org.springblade.system.service.RectFeedbackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Author：liang.chao
* @Date：2025/12/3 - 14:18
*/
@Service
public class RectFeedbackServiceImpl implements RectFeedbackService {
@Resource
private RectFeedbackMapper rectFeedbackMapper;
@Override
public List<RectificationDto> list(RectificationDto dto) {
return rectFeedbackMapper.list(dto);
}
@Override
public RectificationDto detail(RectificationDto dto) {
return rectFeedbackMapper.detail(dto);
}
}