From 411184019b8c7397181eed71530ae079f7295061 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 23 Dec 2025 18:03:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/sales/vo/LngScoreDtlVo.java | 40 +++++++++++++------ .../module/supplier/vo/LngScoreDtlVo.java | 17 ++++++++ .../module/supplier/entity/LngScore.java | 2 +- .../module/supplier/entity/LngScoreDtl.java | 2 + .../service/IScoreSupplierService.java | 8 +--- .../impl/SupplierScoreServiceImpl.java | 8 ---- 6 files changed, 49 insertions(+), 28 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreDtlVo.java index d26866b..496122b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreDtlVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreDtlVo.java @@ -8,6 +8,9 @@ import java.time.LocalDateTime; import java.math.BigDecimal; import java.util.List; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + /** * @title: 表单出参 * @Author 管理员 @@ -74,18 +77,31 @@ public class LngScoreDtlVo { /** - * 实际评分部门编码(当前登录人所在部门) - */ - @ApiModelProperty("实际评分部门编码(当前登录人所在部门)") - private String aDeptCode; - - - /** - * 实际评分人编码(当前登录人) - */ - @ApiModelProperty("实际评分人编码(当前登录人)") - private String aEmpCode; - + * 实际评分部门编码(当前登录人所在部门) + */ + @ApiModelProperty("实际评分部门编码(当前登录人所在部门)") + @Trans(type = TransType.DEPT_BY_CODE, transToFieldName = "aDeptName") + private String aDeptCode; + + /** + * 实际评分部门名称编码(当前登录人所在部门) + */ + @ApiModelProperty("实际评分部门名称(当前登录人所在部门)") + private String aDeptName; + + + /** + * 实际评分人编码(当前登录人) + */ + @ApiModelProperty("实际评分人编码(当前登录人)") + @Trans(type = TransType.USER_BY_CODE, transToFieldName = "aEmpName") + private String aEmpCode; + + /** + * 实际评分人姓名(当前登录人) + */ + @ApiModelProperty("实际评分人姓名(当前登录人)") + private String aEmpName; /** * 实际评分时间 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreDtlVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreDtlVo.java index 07304ff..3a9cb48 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreDtlVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreDtlVo.java @@ -3,6 +3,9 @@ package com.xjrsoft.module.supplier.vo; import java.math.BigDecimal; import java.time.LocalDateTime; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -75,15 +78,29 @@ public class LngScoreDtlVo { * 实际评分部门编码(当前登录人所在部门) */ @ApiModelProperty("实际评分部门编码(当前登录人所在部门)") + @Trans(type = TransType.DEPT_BY_CODE, transToFieldName = "aDeptName") private String aDeptCode; + /** + * 实际评分部门名称编码(当前登录人所在部门) + */ + @ApiModelProperty("实际评分部门名称(当前登录人所在部门)") + private String aDeptName; + /** * 实际评分人编码(当前登录人) */ @ApiModelProperty("实际评分人编码(当前登录人)") + @Trans(type = TransType.USER_BY_CODE, transToFieldName = "aEmpName") private String aEmpCode; + /** + * 实际评分人姓名(当前登录人) + */ + @ApiModelProperty("实际评分人姓名(当前登录人)") + private String aEmpName; + /** * 实际评分时间 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScore.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScore.java index 2cd5a43..6c6e6e2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScore.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScore.java @@ -138,7 +138,7 @@ public class LngScore implements Serializable { @ApiModelProperty("lngScoreDtl子表") @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "sId") - @LogJoin(name = "客户联系人信息", + @LogJoin(name = "客户评分项信息", columns = { @LogJoinColumn(field = "id",relatedField = "sId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = LngScoreDtl.class, type = JoinType.MANY) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScoreDtl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScoreDtl.java index 6fc8569..15354e6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScoreDtl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngScoreDtl.java @@ -5,6 +5,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -98,6 +99,7 @@ public class LngScoreDtl implements Serializable { * 分数 */ @ApiModelProperty("分数") + @TableField(updateStrategy = FieldStrategy.IGNORED) private BigDecimal score; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/IScoreSupplierService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/IScoreSupplierService.java index 7808edb..90a1f3e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/IScoreSupplierService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/IScoreSupplierService.java @@ -18,13 +18,7 @@ import com.xjrsoft.module.supplier.vo.LngScoreVo; public interface IScoreSupplierService extends MPJBaseService, MPJDeepService, MPJRelationService { - /** - * 删除 - * - * @param ids - * @return - */ - Boolean delete(List ids); + LngScoreVo getInfoById(Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java index 83cf18b..1da0454 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java @@ -45,14 +45,6 @@ public class SupplierScoreServiceImpl extends MPJBaseServiceImpl ids) { - supplierScoreMapper.deleteBatchIds(ids); - supplierScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); - - return true; - } @Override