From ebcd73e42d631e43c4e1c9389306bce5ebec8de8 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 18 Dec 2025 18:25:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/UpdateLngCustomerAttrPowerDto.java | 37 ++++++++ .../sales/dto/UpdateLngCustomerBankDto.java | 37 ++++++++ .../dto/UpdateLngCustomerContactDto.java | 37 ++++++++ .../sales/dto/UpdateLngCustomerDocDto.java | 38 ++++++++ .../sales/dto/UpdateLngCustomerDto.java | 39 +++++++- .../sales/dto/UpdateLngScoreDtlDto.java | 37 ++++++++ .../module/sales/dto/UpdateLngScoreDto.java | 37 ++++++++ .../module/sales/vo/LngScoreDtlVo.java | 2 +- .../xjrsoft/module/sales/vo/LngScoreVo.java | 12 ++- .../supplier/dto/UpdateLngScoreDtlDto.java | 37 ++++++++ .../supplier/dto/UpdateLngScoreDto.java | 9 ++ .../dto/UpdateLngSupplierBankDto.java | 37 ++++++++ .../supplier/dto/UpdateLngSupplierDocDto.java | 40 +++++++++ .../supplier/dto/UpdateLngSupplierDto.java | 36 ++++++++ .../module/supplier/vo/LngScoreDtlVo.java | 10 +-- .../module/mdm/controller/BankController.java | 3 +- .../sales/controller/CustomerController.java | 28 +----- .../controller/CustomerScoreController.java | 3 +- .../sales/mapper/LngCustomerScoreMapper.java | 3 +- .../sales/service/IScoreCustomerService.java | 20 ++--- .../impl/CustomerScoreServiceImpl.java | 64 ++++++++++++++ .../impl/ScoreCustomerServiceImpl.java | 88 ------------------- .../controller/SupplierController.java | 6 +- ...ller.java => SupplierScoreController.java} | 2 +- .../module/supplier/entity/LngScore.java | 25 ++++-- .../module/supplier/entity/LngScoreDtl.java | 17 ++-- 26 files changed, 536 insertions(+), 168 deletions(-) create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerScoreServiceImpl.java delete mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/ScoreCustomerServiceImpl.java rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/{ScoreSupplierController.java => SupplierScoreController.java} (99%) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java index 42e68e4..ca7e8ae 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java @@ -75,5 +75,42 @@ public class UpdateLngCustomerAttrPowerDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java index d2da90d..7a4554a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java @@ -89,5 +89,42 @@ public class UpdateLngCustomerBankDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java index 9377a43..41b0812 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java @@ -96,5 +96,42 @@ public class UpdateLngCustomerContactDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java index 75cfd14..765391b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java @@ -90,6 +90,44 @@ public class UpdateLngCustomerDocDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + /** * lngFileUpload */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java index 3fbe923..0a1ca25 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java @@ -14,7 +14,6 @@ import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; -import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -297,4 +296,42 @@ public class UpdateLngCustomerDto implements Serializable { @ApiModelProperty("lngFileUpload子表") @LogAttrField private List lngFileUploadList; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDtlDto.java index 93a647b..4840dc2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDtlDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDtlDto.java @@ -138,5 +138,42 @@ public class UpdateLngScoreDtlDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDto.java index 4906109..8a042e3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngScoreDto.java @@ -95,6 +95,43 @@ public class UpdateLngScoreDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + /** * lngScoreDtl 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 8faa2d4..d26866b 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 @@ -91,7 +91,7 @@ public class LngScoreDtlVo { * 实际评分时间 */ @ApiModelProperty("实际评分时间") - private Object aTime; + private LocalDateTime aTime; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreVo.java index 2be93ac..1bf6774 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScoreVo.java @@ -4,6 +4,9 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.module.supplier.vo.LngScoreDtlVo; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -120,13 +123,16 @@ public class LngScoreVo { @ApiModelProperty("数据权限id") private Long ruleUserId; - - - /** * lngScoreDtl */ @ApiModelProperty("lngScoreDtl子表") private List lngScoreDtlList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDtlDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDtlDto.java index bdfceec..a6e141e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDtlDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDtlDto.java @@ -138,5 +138,42 @@ public class UpdateLngScoreDtlDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java index fb9cd95..10ab265 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java @@ -8,11 +8,13 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.pictc.annotations.datalog.JoinCaseType; import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogAttrField; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogJoin; import com.pictc.annotations.datalog.LogJoinColumn; import com.pictc.annotations.datalog.LogTable; import com.pictc.annotations.datalog.ValueDirectionType; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -106,4 +108,11 @@ public class UpdateLngScoreDto implements Serializable { }, caseType = JoinCaseType.FULL, target = UpdateLngScoreDtlDto.class, type = JoinType.MANY) private List lngScoreDtlList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + @LogAttrField + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierBankDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierBankDto.java index 47efb71..ccdcc15 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierBankDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierBankDto.java @@ -89,5 +89,42 @@ public class UpdateLngSupplierBankDto implements Serializable { @ApiModelProperty("租户id") private Long tenantId; + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDocDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDocDto.java index d482509..010d68b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDocDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDocDto.java @@ -103,5 +103,45 @@ public class UpdateLngSupplierDocDto implements Serializable { @ApiModelProperty("lngFileUpload子表") @LogAttrField private List fileList; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDto.java index aeb4323..5135c6c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngSupplierDto.java @@ -230,4 +230,40 @@ public class UpdateLngSupplierDto implements Serializable { @ApiModelProperty("lngFileUpload子表") @LogAttrField private List lngFileUploadList; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; } 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 5b4ab07..07304ff 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 @@ -1,13 +1,11 @@ package com.xjrsoft.module.supplier.vo; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; - /** * @title: 表单出参 * @Author 管理员 @@ -91,7 +89,7 @@ public class LngScoreDtlVo { * 实际评分时间 */ @ApiModelProperty("实际评分时间") - private Object aTime; + private LocalDateTime aTime; /** diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java index 46beb38..a72034b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java @@ -85,8 +85,7 @@ public class BankController { // .like(StrUtil.isNotBlank(dto.getFullName()),LngBBank::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getCode()),LngBBank::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getSwift()),LngBBank::getSwift,dto.getSwift()) - .orderByAsc(LngBBank::getSort,LngBBank::getCode) - .select(LngBBank.class,x -> VoToColumnUtil.fieldsToColumns(LngBBankPageVo.class).contains(x.getProperty())); + .orderByAsc(LngBBank::getSort,LngBBank::getCode); IPage page = bankService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBBankPageVo.class); return R.ok(pageOutput); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java index ca8b46e..8891fbf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java @@ -70,11 +70,10 @@ public class CustomerController { .like(StrUtil.isNotBlank(dto.getClassCode()),LngCustomer::getClassCode,dto.getClassCode()) .like(StrUtil.isNotBlank(dto.getTypeCode()),LngCustomer::getTypeCode,dto.getTypeCode()) .like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode()) - .like(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid()) + .eq(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode()) - .orderByDesc(LngCustomer::getId) - .select(LngCustomer.class,x -> VoToColumnUtil.fieldsToColumns(LngCustomerPageVo.class).contains(x.getProperty())); - IPage page = customerService.page(ConventPage.getPage(dto), queryWrapper); + .orderByAsc(LngCustomer::getCuCode); + IPage page = customerService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class); return R.ok(pageOutput); } @@ -105,27 +104,6 @@ public class CustomerController { UpdateLngCustomerDto obj = dataService.insert(dto); codeRuleClient.useEncode(CUSTOMER_CODE); return R.ok(obj); - /** - return R.ok(dataService.insert(dto,new DataOperationListener() { - - @Override - public UpdateLngCustomerDto before(DataOperationContent content) { - - return content.getObj(); - } - - @Override - public UpdateLngCustomerDto after(DataOperationContent content) { - String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); - - if (StringUtils.isNotEmpty(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - codeRuleClient.useEncode(CUSTOMER_CODE); - return content.getObj(); - } - })); - **/ } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java index cbaecb1..f6413ae 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java @@ -65,8 +65,7 @@ public class CustomerScoreController { .eq(ObjectUtil.isNotNull(dto.getScore()),LngScore::getScore,dto.getScore()) .like(StrUtil.isNotBlank(dto.getApproCode()),LngScore::getApproCode,dto.getApproCode()) .like(StrUtil.isNotBlank(dto.getNote()),LngScore::getNote,dto.getNote()) - .orderByDesc(LngScore::getId) - .select(LngScore.class,x -> VoToColumnUtil.fieldsToColumns(LngScorePageVo.class).contains(x.getProperty())); + .orderByDesc(LngScore::getId); IPage page = scoreCustomerService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngScorePageVo.class); return R.ok(pageOutput); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreMapper.java index 373d174..d613456 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreMapper.java @@ -1,9 +1,10 @@ package com.xjrsoft.module.sales.mapper; +import org.apache.ibatis.annotations.Mapper; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.sales.entity.LngScore; -import org.apache.ibatis.annotations.Mapper; /** * @title: mapper diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/IScoreCustomerService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/IScoreCustomerService.java index 2ff68a0..4a373d9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/IScoreCustomerService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/IScoreCustomerService.java @@ -5,6 +5,8 @@ import com.github.yulichang.base.MPJBaseService; import com.github.yulichang.extension.mapping.base.MPJDeepService; import com.github.yulichang.extension.mapping.base.MPJRelationService; import com.xjrsoft.module.sales.entity.LngScore; +import com.xjrsoft.module.sales.vo.LngScoreVo; + import lombok.Data; import java.util.List; @@ -16,21 +18,7 @@ import java.util.List; */ public interface IScoreCustomerService extends MPJBaseService, MPJDeepService, MPJRelationService { - /** - * 新增 - * - * @param lngScore - * @return - */ - Boolean add(LngScore lngScore); - - /** - * 更新 - * - * @param lngScore - * @return - */ - Boolean update(LngScore lngScore); + /** * 删除 @@ -39,4 +27,6 @@ public interface IScoreCustomerService extends MPJBaseService, MPJDeep * @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/sales/service/impl/CustomerScoreServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerScoreServiceImpl.java new file mode 100644 index 0000000..a01553c --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerScoreServiceImpl.java @@ -0,0 +1,64 @@ +package com.xjrsoft.module.sales.service.impl; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.sales.entity.LngCustomer; +import com.xjrsoft.module.sales.entity.LngScore; +import com.xjrsoft.module.sales.entity.LngScoreDtl; +import com.xjrsoft.module.sales.mapper.LngCustomerScoreDtlMapper; +import com.xjrsoft.module.sales.mapper.LngCustomerScoreMapper; +import com.xjrsoft.module.sales.service.IScoreCustomerService; +import com.xjrsoft.module.sales.vo.LngCustomerDocVo; +import com.xjrsoft.module.sales.vo.LngCustomerVo; +import com.xjrsoft.module.sales.vo.LngScoreVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-12-17 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class CustomerScoreServiceImpl extends MPJBaseServiceImpl implements IScoreCustomerService { + private final LngCustomerScoreMapper scoreCustomerLngScoreMapper; + + private final LngCustomerScoreDtlMapper scoreCustomerLngScoreDtlMapper; + + private final IFileClient fileClient; + + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean delete(List ids) { + scoreCustomerLngScoreMapper.deleteBatchIds(ids); + scoreCustomerLngScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); + + return true; + } + + @Override + public LngScoreVo getInfoById(Long id) { + LngScore lngScore = this.getByIdDeep(id); + if(lngScore == null) { + return null; + } + LngScoreVo vo = BeanUtil.toBean(lngScore, LngScoreVo.class); + List fileList = fileClient.getTableFiles("lng_score", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/ScoreCustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/ScoreCustomerServiceImpl.java deleted file mode 100644 index 5b60139..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/ScoreCustomerServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.xjrsoft.module.sales.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; -import com.xjrsoft.module.sales.entity.LngScoreDtl; -import com.xjrsoft.module.sales.mapper.LngCustomerScoreDtlMapper; -import com.xjrsoft.module.sales.entity.LngScore; -import com.xjrsoft.module.sales.mapper.LngCustomerScoreMapper; -import com.xjrsoft.module.sales.service.IScoreCustomerService; -import lombok.AllArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; - -/** -* @title: service -* @Author 管理员 -* @Date: 2025-12-17 -* @Version 1.0 -*/ -@Service -@AllArgsConstructor -public class ScoreCustomerServiceImpl extends MPJBaseServiceImpl implements IScoreCustomerService { - private final LngCustomerScoreMapper scoreCustomerLngScoreMapper; - - private final LngCustomerScoreDtlMapper scoreCustomerLngScoreDtlMapper; - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean add(LngScore lngScore) { - scoreCustomerLngScoreMapper.insert(lngScore); - for (LngScoreDtl lngScoreDtl : lngScore.getLngScoreDtlList()) { - lngScoreDtl.setSId(lngScore.getId()); - scoreCustomerLngScoreDtlMapper.insert(lngScoreDtl); - } - - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean update(LngScore lngScore) { - scoreCustomerLngScoreMapper.updateById(lngScore); - //********************************* LngScoreDtl 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngScoreDtlList = scoreCustomerLngScoreDtlMapper.selectList(Wrappers.lambdaQuery(LngScoreDtl.class).eq(LngScoreDtl::getSId, lngScore.getId()).select(LngScoreDtl::getId)); - List lngScoreDtlIds = lngScoreDtlList.stream().map(LngScoreDtl::getId).collect(Collectors.toList()); - //原有子表单 没有被删除的主键 - List lngScoreDtlOldIds = lngScore.getLngScoreDtlList().stream().map(LngScoreDtl::getId).filter(Objects::nonNull).collect(Collectors.toList()); - //找到需要删除的id - List lngScoreDtlRemoveIds = lngScoreDtlIds.stream().filter(item -> !lngScoreDtlOldIds.contains(item)).collect(Collectors.toList()); - - for (LngScoreDtl lngScoreDtl : lngScore.getLngScoreDtlList()) { - //如果不等于空则修改 - if (lngScoreDtl.getId() != null) { - scoreCustomerLngScoreDtlMapper.updateById(lngScoreDtl); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngScoreDtl.setSId(lngScore.getId()); - scoreCustomerLngScoreDtlMapper.insert(lngScoreDtl); - } - } - //已经不存在的id 删除 - if(lngScoreDtlRemoveIds.size() > 0){ - scoreCustomerLngScoreDtlMapper.deleteBatchIds(lngScoreDtlRemoveIds); - } - } - //********************************* LngScoreDtl 增删改 结束 *******************************************/ - - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean delete(List ids) { - scoreCustomerLngScoreMapper.deleteBatchIds(ids); - scoreCustomerLngScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); - - return true; - } -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java index 0ee55ae..c663983 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java @@ -21,17 +21,14 @@ import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.sales.dto.UpdateLngCustomerDto; import com.xjrsoft.module.supplier.dto.LngSupplierPageDto; import com.xjrsoft.module.supplier.dto.UpdateLngSupplierDto; import com.xjrsoft.module.supplier.entity.LngSupplier; import com.xjrsoft.module.supplier.service.ISupplierService; import com.xjrsoft.module.supplier.vo.LngSupplierPageVo; -import com.xjrsoft.module.supplier.vo.LngSupplierVo; import com.xjrsoft.module.system.client.ICodeRuleClient; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -73,8 +70,7 @@ public class SupplierController { .like(StrUtil.isNotBlank(dto.getDI()),LngSupplier::getDI,dto.getDI()) .eq(StrUtil.isNotBlank(dto.getValid()),LngSupplier::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getApproCode()),LngSupplier::getApproCode,dto.getApproCode()) - .orderByDesc(LngSupplier::getId) - .select(LngSupplier.class,x -> VoToColumnUtil.fieldsToColumns(LngSupplierPageVo.class).contains(x.getProperty())); + .orderByDesc(LngSupplier::getSuCode); IPage page = supplierService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngSupplierPageVo.class); return R.ok(pageOutput); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/ScoreSupplierController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java similarity index 99% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/ScoreSupplierController.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java index ddd80e9..f6d4bdd 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/ScoreSupplierController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java @@ -46,7 +46,7 @@ import lombok.AllArgsConstructor; @RequestMapping("/supplier" + "/scoreSupplier") @Api(value = "/supplier" + "/scoreSupplier",tags = "供应商评价代码") @AllArgsConstructor -public class ScoreSupplierController { +public class SupplierScoreController { private final IScoreSupplierService scoreSupplierService; 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 18a001f..2cd5a43 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 @@ -1,20 +1,24 @@ package com.xjrsoft.module.supplier.entity; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; +import com.baomidou.mybatisplus.annotation.TableName; import com.github.yulichang.annotation.EntityMapping; +import com.pictc.annotations.datalog.JoinCaseType; +import com.pictc.annotations.datalog.JoinType; +import com.pictc.annotations.datalog.LogJoin; +import com.pictc.annotations.datalog.LogJoinColumn; +import com.pictc.annotations.datalog.ValueDirectionType; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** @@ -134,6 +138,11 @@ public class LngScore implements Serializable { @ApiModelProperty("lngScoreDtl子表") @TableField(exist = false) @EntityMapping(thisField = "id", joinField = "sId") + @LogJoin(name = "客户联系人信息", + columns = { + @LogJoinColumn(field = "id",relatedField = "sId", valueDirection = ValueDirectionType.RIGHT) + }, caseType = JoinCaseType.FULL, target = LngScoreDtl.class, type = JoinType.MANY) + private List lngScoreDtlList; } \ No newline at end of file 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 ec86d39..6fc8569 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 @@ -1,20 +1,17 @@ package com.xjrsoft.module.supplier.entity; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.Version; -import com.github.yulichang.annotation.EntityMapping; +import com.baomidou.mybatisplus.annotation.TableName; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; /** @@ -95,7 +92,7 @@ public class LngScoreDtl implements Serializable { * 实际评分时间 */ @ApiModelProperty("实际评分时间") - private Object aTime; + private LocalDateTime aTime; /** * 分数