From 44b6323b773529039c1b53bf4cd96daf8611da5f Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Thu, 5 Jun 2025 15:16:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98=E5=92=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD-=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E7=AB=9E=E4=BA=89=E5=AF=B9=E6=89=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BF=9D=E5=AD=98=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84=E9=97=AE=E9=A2=98=20-=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=93=81=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E7=9A=84=E4=BA=A7=E5=93=81=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20-=20=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E8=80=85=E7=94=A8=E6=88=B7=E5=90=8D=E5=AD=97=E6=AE=B5=20-=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20mapper=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/sip/domain/ProjectOperateLog.java | 1 + .../ruoyi/sip/service/impl/ProjectInfoServiceImpl.java | 8 ++++---- .../main/resources/mapper/sip/ProjectOperateLogMapper.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) 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 9e3f187d..9d7a9942 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 @@ -31,6 +31,7 @@ public class ProjectOperateLog extends BaseEntity /** 操作人员 */ @Excel(name = "操作人员") private String operateUser; + private String operateUserName; /** 操作时间 */ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java index 6c76468d..12153368 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java @@ -124,7 +124,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { projectInfo.setUpdateTime(DateUtils.getNowDate()); projectInfo.setCreateBy(ShiroUtils.getUserId().toString()); if (CollUtil.isNotEmpty(projectInfo.getCompetitorList())) { - projectInfo.setCompetitor(CollUtil.join(projectInfo.getCompetitorList(), ",")); + projectInfo.setCompetitor(projectInfo.getCompetitorList().stream().filter(StringUtils::isNotEmpty).collect(Collectors.joining(","))); } int i = projectInfoMapper.insertProjectInfo(projectInfo); saveOtherInfo(projectInfo); @@ -297,15 +297,15 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { if (oldProduct == null && newProduct != null) { // 新增产品 - logContent.append(index).append(".").append(type).append("新增：").append(newProduct.getProductCode()).append("\n"); + logContent.append(index).append(".").append(type).append("新增：").append(newProduct.getProductBomCode()).append("\n"); index++; } else if (oldProduct != null && newProduct == null) { // 删除产品 - logContent.append(index).append(".").append(type).append("删除：").append(oldProduct.getProductCode()).append("\n"); + logContent.append(index).append(".").append(type).append("删除：").append(oldProduct.getProductBomCode()).append("\n"); index++; } else if (oldProduct != null) { // 变更产品 - index = compareField(logContent, index, "产品编号", oldProduct.getProductCode(), newProduct.getProductCode()); + index = compareField(logContent, index, "产品编号", oldProduct.getProductBomCode(), newProduct.getProductBomCode()); index = compareField(logContent, index, "数量", oldProduct.getQuantity(), newProduct.getQuantity()); index = compareField(logContent, index, "目录单价", oldProduct.getCataloguePrice(), newProduct.getCataloguePrice()); index = compareField(logContent, index, "指导折扣", oldProduct.getGuidanceDiscount(), newProduct.getGuidanceDiscount()); diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOperateLogMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOperateLogMapper.xml index b66cffa3..cb68cb76 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOperateLogMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOperateLogMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" , t1.operate_time , t1.project_id , t1.log_type - , t2.user_name + , t2.user_name as operate_user_name from project_operate_log t1 left join sys_user t2 on operate_user = t2.user_id where t1.project_id = #{projectId}