From 3f43659714932971f69cc8b09974385ebdf244cd Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Fri, 6 Jun 2025 17:35:17 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=90=88=E5=90=8C=E6=96=87=E4=BB=B6=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IProjectOrderFileLogService 接口中添加 updateOrderIdByIdList 方法 - 在 ProjectOrderFileLogMapper 接口中添加对应的 SQL 更新语句- 修改 ProjectOrderFileLogServiceImpl 实现类，添加 updateOrderIdByIdList 方法的实现 - 更新 ProjectOrderInfoController 中的文件上传逻辑，返回更详细的成功信息 -优化 ProjectOrderInfoServiceImpl 中的订单信息保存逻辑，关联合同文件- 调整 ProjectOperateLog 中操作时间的格式，增加时分秒信息 --- .../sip/controller/ProjectOrderInfoController.java | 2 +- .../java/com/ruoyi/sip/domain/ProjectOperateLog.java | 2 +- .../ruoyi/sip/mapper/ProjectOrderFileLogMapper.java | 5 +++++ .../sip/service/IProjectOrderFileLogService.java | 2 ++ .../service/impl/ProjectOrderFileLogServiceImpl.java | 11 +++++++++++ .../sip/service/impl/ProjectOrderInfoServiceImpl.java | 7 ++++++- .../mapper/sip/ProjectOrderFileLogMapper.xml | 8 ++++++++ 7 files changed, 34 insertions(+), 3 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java index 57a380f0..0e0ffc24 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProjectOrderInfoController.java @@ -182,7 +182,7 @@ public class ProjectOrderInfoController extends BaseController return AjaxResult.error("上传失败"); } fileLogService.insertProjectOrderFileLog(projectOrderFileLog); - return AjaxResult.success("导入成功"); + return AjaxResult.success(projectOrderFileLog); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOperateLog.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOperateLog.java index 9d7a9942..85c549ac 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOperateLog.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOperateLog.java @@ -34,7 +34,7 @@ public class ProjectOperateLog extends BaseEntity private String operateUserName; /** 操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd") private Date operateTime; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderFileLogMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderFileLogMapper.java index 3e866b68..f5a22cdd 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderFileLogMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderFileLogMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.sip.mapper; import java.util.List; import com.ruoyi.sip.domain.ProjectOrderFileLog; +import org.apache.ibatis.annotations.Param; /** * 订单文件Mapper接口 @@ -62,4 +63,8 @@ public interface ProjectOrderFileLogMapper void deleteProjectOrderFileLogByOrderIdList(List longs); List listByOrderId(List orderIdList); + + + + void updateOrderIdByIdList(@Param("orderId") Long orderId,@Param("list") List idList); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderFileLogService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderFileLogService.java index c6388deb..ffad3d28 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderFileLogService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderFileLogService.java @@ -62,4 +62,6 @@ public interface IProjectOrderFileLogService void deleteProjectOrderFileLogByOrderIdList(List longs); List listByOrderId(List longs); + + void updateOrderIdByIdList(Long orderId, List idList) ; } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderFileLogServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderFileLogServiceImpl.java index 7770d18c..d5a4f840 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderFileLogServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderFileLogServiceImpl.java @@ -2,6 +2,9 @@ package com.ruoyi.sip.service.impl; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; + +import cn.hutool.core.collection.CollUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.sip.mapper.ProjectOrderFileLogMapper; @@ -102,4 +105,12 @@ public class ProjectOrderFileLogServiceImpl implements IProjectOrderFileLogServi public List listByOrderId(List orderIdList) { return projectOrderFileLogMapper.listByOrderId(orderIdList); } + + @Override + public void updateOrderIdByIdList(Long orderId, List idList) { + if (CollUtil.isEmpty(idList)){ + return; + } + projectOrderFileLogMapper.updateOrderIdByIdList(orderId,idList); + } } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index ca320185..67729c39 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -89,7 +89,12 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { projectOrderInfo.setCreateTime(DateUtils.getNowDate()); projectOrderInfo.setCreateBy(ShiroUtils.getUserId().toString()); saveProductInfo(projectOrderInfo); - return projectOrderInfoMapper.insertProjectOrderInfo(projectOrderInfo); + List contractFileList = projectOrderInfo.getContractFileList(); + int i = projectOrderInfoMapper.insertProjectOrderInfo(projectOrderInfo); + if (CollUtil.isNotEmpty(contractFileList)) { + fileLogService.updateOrderIdByIdList(projectOrderInfo.getId(), contractFileList.stream().map(ProjectOrderFileLog::getId).collect(Collectors.toList())); + } + return i; } private void saveProductInfo(ProjectOrderInfo projectOrderInfo) { diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderFileLogMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderFileLogMapper.xml index 50d6ad2c..0989643f 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderFileLogMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderFileLogMapper.xml @@ -75,6 +75,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + update project_order_file_log set order_id=#{orderId} + where id in + + #{item} + + + delete from project_order_file_log where id = #{id}