Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

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("实际评分部门编码(当前登录人所在部门)")
+     @ApiModelProperty("实际评分部门编码(当前登录人所在部门)")
-    private String aDeptCode;
+     @Trans(type = TransType.DEPT_BY_CODE, transToFieldName = "aDeptName")
-    
+     private String aDeptCode;
-    
+     
-    /**
+     /**
-    * 实际评分人编码(当前登录人)
+      * 实际评分部门名称编码(当前登录人所在部门)
-    */
+      */
-    @ApiModelProperty("实际评分人编码(当前登录人)")
+      @ApiModelProperty("实际评分部门名称(当前登录人所在部门)")
-    private String aEmpCode;
+      private String aDeptName;
-    
+     
+     
+     /**
+     * 实际评分人编码(当前登录人)
+     */
+     @ApiModelProperty("实际评分人编码(当前登录人)")
+     @Trans(type = TransType.USER_BY_CODE, transToFieldName = "aEmpName")
+     private String aEmpCode;
+     
+     /**
+      * 实际评分人姓名(当前登录人)
+      */
+      @ApiModelProperty("实际评分人姓名(当前登录人)")
+      private String aEmpName;
     
     /**
     * 实际评分时间

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;
+    
     
     /**
     * 实际评分时间

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)

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;
     
     /**

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<LngScore>, MPJDeepService<LngScore>, MPJRelationService<LngScore> {
     
 
-    /**
+
-    * 删除
-    *
-    * @param ids
-    * @return
-    */
-    Boolean delete(List<Long> ids);
 
     LngScoreVo getInfoById(Long id);
 }

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<LngSupplierScor
     private final IFileClient fileClient;
 
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Boolean delete(List<Long> ids) {
-      	supplierScoreMapper.deleteBatchIds(ids);
-      	supplierScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids));
-
-        return true;
-    }
 
 
 	@Override