diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferProblemController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferProblemController.java new file mode 100644 index 0000000..bce9cb8 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferProblemController.java @@ -0,0 +1,98 @@ +package com.bonus.web.controller.archive; + +import com.bonus.common.annotation.RequiresPermissions; +import com.bonus.common.annotation.SysLog; +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.enums.OperaType; +import com.bonus.web.domain.TransferApplyDto; +import com.bonus.web.domain.TransferFileDto; +import com.bonus.web.domain.TransferProblemDto; +import com.bonus.web.service.TransferApplyService; +import com.bonus.web.service.TransferProblemService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/9/18 - 16:06 + */ + +@RestController +@RequestMapping("/transferProblem") +@Slf4j +public class FileTransferProblemController extends BaseController { + + @Autowired + private TransferProblemService transferProblemService; + + @ApiOperation(value = "档案移交问题列表") + @GetMapping("getTransferProblemList") + @SysLog(title = "档案移交问题列表", module = "数据/档案移交->档案移交问题管理", businessType = OperaType.QUERY, details = "档案移交问题列表", logType = 1) + @RequiresPermissions("transfer:problem:list") + public TableDataInfo getTransferProblemList(TransferProblemDto dto) { + try { + startPage(); + List list = transferProblemService.list(dto); + return getDataTable(list); + } catch (Exception e) { + log.error(e.toString(), e); + return getDataTable(new ArrayList<>()); + } + } + + @ApiOperation(value = "新增档案移交问题") + @PostMapping("addTransferProblem") + @SysLog(title = "新增档案移交问题", module = "数据/档案移交->档案移交问题管理", businessType = OperaType.INSERT, details = "新增档案移交问题", logType = 1) + @RequiresPermissions("transfer:problem:add") + public AjaxResult addTransferProblem(@RequestBody TransferProblemDto dto) { + try { + return transferProblemService.add(dto); + } catch (Exception e) { + return AjaxResult.error("请求出错了"); + } + } + + @ApiOperation(value = "修改档案移交问题") + @PostMapping("editTransferProblem") + @SysLog(title = "修改档案移交问题", module = "数据/档案移交->档案移交问题管理", businessType = OperaType.UPDATE, details = "修改档案移交问题", logType = 1) + @RequiresPermissions("transfer:problem:edit") + public AjaxResult editTransferProblem(@RequestBody TransferProblemDto dto) { + try { + return transferProblemService.edit(dto); + } catch (Exception e) { + return AjaxResult.error("请求出错了"); + } + } + + @ApiOperation(value = "删除档案移交问题") + @PostMapping("delTransferProblem") + @SysLog(title = "删除档案移交问题", module = "数据/档案移交->档案移交问题管理", businessType = OperaType.DELETE, details = "删除档案移交问题", logType = 1) + @RequiresPermissions("transfer:problem:del") + public AjaxResult delTransferProblem(@RequestBody TransferProblemDto dto) { + try { + return transferProblemService.del(dto); + } catch (Exception e) { + return AjaxResult.error("请求出错了"); + } + } + + @ApiOperation(value = "档案移交问题详情") + @GetMapping("getTransferProblemById") + @SysLog(title = "档案移交问题详情", module = "数据/档案移交->档案移交问题管理", businessType = OperaType.QUERY, details = "档案移交问题详情", logType = 1) + @RequiresPermissions("transfer:problem:query") + public AjaxResult getTransferProblemById(TransferProblemDto dto) { + try { + return transferProblemService.getTransferProblemById(dto); + } catch (Exception e) { + return AjaxResult.error("请求出错了"); + } + } + +} diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java index 4c9fde1..e5d6d38 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileTransferRecordController.java @@ -31,9 +31,9 @@ public class FileTransferRecordController extends BaseController { @Autowired private TransferApplyService transferApplyService; - @ApiOperation(value = "档案移交申请列表") + @ApiOperation(value = "档案移交记录列表") @GetMapping("getTransferRecordList") - @SysLog(title = "档案移交申请列表", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请列表", logType = 1) + @SysLog(title = "档案移交记录列表", module = "数据/档案移交->档案移交记录", businessType = OperaType.QUERY, details = "档案移交记录列表", logType = 1) @RequiresPermissions("transfer:record:list") public TableDataInfo getTransferRecordList(TransferApplyDto dto) { try { @@ -47,9 +47,9 @@ public class FileTransferRecordController extends BaseController { } } - @ApiOperation(value = "档案移交申请详情") + @ApiOperation(value = "档案移交记录详情") @GetMapping("getTransferRecordDetail") - @SysLog(title = "档案移交申请详情", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请详情", logType = 1) + @SysLog(title = "档案移交记录详情", module = "数据/档案移交->档案移交记录", businessType = OperaType.QUERY, details = "档案移交记录详情", logType = 1) @RequiresPermissions("transfer:record:query") public AjaxResult getTransferApply(TransferApplyDto dto) { try { @@ -60,9 +60,9 @@ public class FileTransferRecordController extends BaseController { return AjaxResult.error("请求出错了"); } } - @ApiOperation(value = "档案移交申请详情") + @ApiOperation(value = "档案移交清单详情") @GetMapping("getTransferRecordFiles") - @SysLog(title = "档案移交申请详情", module = "数据/档案移交->档案移交申请", businessType = OperaType.QUERY, details = "档案移交申请详情", logType = 1) + @SysLog(title = "档案移交清单详情", module = "数据/档案移交->档案移交记录", businessType = OperaType.QUERY, details = "档案移交清单详情", logType = 1) public AjaxResult getTransferRecordFiles(TransferFileDto dto) { try { List recordFiles = transferApplyService.getTransferRecordFiles(dto); @@ -72,5 +72,16 @@ public class FileTransferRecordController extends BaseController { return AjaxResult.error("请求出错了"); } } + @ApiOperation(value = "修改档案移交清单文件名") + @GetMapping("updateTransferRecordFile") + @SysLog(title = "修改档案移交清单文件名", module = "数据/档案移交->档案移交记录", businessType = OperaType.QUERY, details = "修改档案移交清单文件名", logType = 1) + public AjaxResult updateTransferRecordFile(TransferFileDto dto) { + try { + return transferApplyService.updateTransferRecordFile(dto); + } catch (Exception e) { + log.error(e.toString(), e); + return AjaxResult.error("请求出错了"); + } + } } diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/TransferFileDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/TransferFileDto.java index 8ae0c82..e9a5d35 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/TransferFileDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/TransferFileDto.java @@ -72,4 +72,8 @@ public class TransferFileDto { * 修改时间 */ private String updateTime; + + private String parParentName; + + private String parentName; } diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/TransferProblemDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/TransferProblemDto.java new file mode 100644 index 0000000..45426be --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/domain/TransferProblemDto.java @@ -0,0 +1,85 @@ +package com.bonus.web.domain; + +import lombok.Data; + +/** + * @Author：liang.chao + * @Date：2025/9/19 - 14:57 + */ +@Data +public class TransferProblemDto { + /** + * 主键ID + */ + private Long id; + + /** + * 工程id + */ + private String proId; + + /** + * 项目名称 + */ + private String proName; + + /** + * 单项工程名称 + */ + private String singleProName; + + /** + * 移交时间 + */ + private String transferTime; + + /** + * 接收单位id + */ + private String deptId; + + /** + * 接收单位名称 + */ + private String deptName; + + /** + * 移交问题 + */ + private String transferIssue; + + /** + * 创建时间 + */ + private String createTime; + + /** + * 修改时间 + */ + private String updateTime; + + /** + * 创建人 + */ + private Long createUserId; + + /** + * 创建人姓名 + */ + private String createUserName; + + /** + * 修改人 + */ + private Long updateUserId; + + /** + * 修改人姓名 + */ + private String updateUserName; + + /** + * 是否删除 0.删除 1.未删除 + */ + private String delFlag; +} diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java index 0d32c68..acd2202 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java @@ -46,4 +46,6 @@ public interface TransferApplyMapper { List getTransferRecordFiles(TransferFileDto dto); String getProNameById(TransferApplyDto dto); + + Integer updateTransferRecordFile(TransferFileDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/TransferProblemMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferProblemMapper.java new file mode 100644 index 0000000..2eeb6d3 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/TransferProblemMapper.java @@ -0,0 +1,24 @@ +package com.bonus.web.mapper; + +import com.bonus.common.core.domain.AjaxResult; +import org.apache.ibatis.annotations.Mapper; +import com.bonus.web.domain.TransferProblemDto; + +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/9/19 - 14:59 + */ +@Mapper +public interface TransferProblemMapper { + public List list(TransferProblemDto dto); + + Integer add(TransferProblemDto dto); + + Integer edit(TransferProblemDto dto); + + Integer del(TransferProblemDto dto); + + TransferProblemDto getTransferProblemById(TransferProblemDto dto); +} diff --git a/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java b/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java index 1250c97..ff589a6 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/TransferApplyService.java @@ -33,4 +33,6 @@ public interface TransferApplyService { List getTransferApplyFiles(TransferApplyDto dto); List getTransferRecordFiles(TransferFileDto dto); + + AjaxResult updateTransferRecordFile(TransferFileDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/TransferProblemService.java b/bonus-admin/src/main/java/com/bonus/web/service/TransferProblemService.java new file mode 100644 index 0000000..769b593 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/service/TransferProblemService.java @@ -0,0 +1,23 @@ +package com.bonus.web.service; + +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.web.domain.TransferProblemDto; + +import java.util.List; + +/** + * @Author：liang.chao + * @Date：2025/9/19 - 14:49 + */ +public interface TransferProblemService { + + List list(TransferProblemDto dto); + + AjaxResult add(TransferProblemDto dto); + + AjaxResult edit(TransferProblemDto dto); + + AjaxResult del(TransferProblemDto dto); + + AjaxResult getTransferProblemById(TransferProblemDto dto); +} diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java index cf70900..97e353c 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java @@ -133,4 +133,10 @@ public class TransferApplyServiceImpl implements TransferApplyService { public List getTransferRecordFiles(TransferFileDto dto) { return transferApplyMapper.getTransferRecordFiles(dto); } + + @Override + public AjaxResult updateTransferRecordFile(TransferFileDto dto) { + Integer i = transferApplyMapper.updateTransferRecordFile(dto); + return i > 0 ? AjaxResult.success("修改成功") : AjaxResult.error("修改失败"); + } } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferProblemServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferProblemServiceImpl.java new file mode 100644 index 0000000..77e0e48 --- /dev/null +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/TransferProblemServiceImpl.java @@ -0,0 +1,59 @@ +package com.bonus.web.service.impl; + +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.utils.SecurityUtils; +import com.bonus.web.domain.TransferProblemDto; +import com.bonus.web.mapper.TransferProblemMapper; +import com.bonus.web.service.TransferProblemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +import static com.bonus.common.utils.SecurityUtils.getUserId; + +/** + * @Author：liang.chao + * @Date：2025/9/19 - 14:50 + */ +@Service +public class TransferProblemServiceImpl implements TransferProblemService { + + @Autowired + private TransferProblemMapper transferProblemMapper; + + @Override + public List list(TransferProblemDto dto) { + return transferProblemMapper.list(dto); + } + + @Override + public AjaxResult add(TransferProblemDto dto) { + dto.setCreateUserId(getUserId()); + dto.setUpdateUserId(getUserId()); + dto.setCreateUserName(SecurityUtils.getUsername()); + dto.setUpdateUserName(SecurityUtils.getUsername()); + Integer result = transferProblemMapper.add(dto); + return result > 0 ? AjaxResult.success() : AjaxResult.error(); + } + + @Override + public AjaxResult edit(TransferProblemDto dto) { + dto.setUpdateUserId(getUserId()); + dto.setUpdateUserName(SecurityUtils.getUsername()); + Integer result = transferProblemMapper.edit(dto); + return result > 0 ? AjaxResult.success() : AjaxResult.error(); + } + + @Override + public AjaxResult del(TransferProblemDto dto) { + Integer result = transferProblemMapper.del(dto); + return result > 0 ? AjaxResult.success() : AjaxResult.error(); + } + + @Override + public AjaxResult getTransferProblemById(TransferProblemDto dto) { + TransferProblemDto transferProblemDto = transferProblemMapper.getTransferProblemById(dto); + return AjaxResult.success(transferProblemDto); + } +} diff --git a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml index 798c6f3..00f1cb8 100644 --- a/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml +++ b/bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml @@ -270,6 +270,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} + + UPDATE da_ky_transfer_file + SET file_name = #{fileName} + WHERE id = #{id} + DELETE FROM da_ky_transfer_file WHERE transfer_apply_id = #{id} @@ -444,7 +449,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND NOT EXISTS ( SELECT 1 FROM da_ky_transfer_file tf WHERE tf.file_source_id = dkfs.id ) + SELECT + id, + pro_id AS proId, + pro_name AS proName, + single_pro_name AS singleProName, + transfer_time AS transferTime, + dept_id AS deptId, + dept_name AS deptName, + transfer_issue AS transferIssue, + 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_transfer_issue dkti + left join da_ky_project dkp ON dkti.pro_id = dkp.id + WHERE + del_flag = '1' + + AND dkti.single_pro_name = #{proName} + + + and dkp.pro_type = #{proType} + + + and dkp.voltage_level = #{voltageLevel} + + ORDER BY + dkti.create_time DESC + + +