From 3c9133a44e7a2c64db6a540a637f5ac960b9a097 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 19 Dec 2025 15:35:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=AF=84?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/sales/dto/UpdateLngScoreDto.java | 11 ++- .../supplier/dto/UpdateLngScoreDto.java | 4 +- .../module/supplier/vo/LngScorePageVo.java | 2 +- .../module/supplier/vo/LngScoreVo.java | 8 ++ .../controller/CustomerScoreController.java | 32 +++++-- .../xjrsoft/module/sales/entity/LngScore.java | 25 ++++-- .../controller/SupplierScoreController.java | 35 +++++--- .../service/IScoreSupplierService.java | 24 ++--- .../impl/ScoreSupplierServiceImpl.java | 88 ------------------- .../impl/SupplierScoreServiceImpl.java | 61 +++++++++++++ 10 files changed, 152 insertions(+), 138 deletions(-) delete mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/ScoreSupplierServiceImpl.java create mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java 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 8a042e3..66b906d 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 @@ -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; @@ -139,8 +141,15 @@ public class UpdateLngScoreDto implements Serializable { @ApiModelProperty("lngScoreDtl子表") @LogJoin(name = "lngScoreDtl子表", columns = { - @LogJoinColumn(field = "sId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "sId", valueDirection = ValueDirectionType.RIGHT) }, 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/UpdateLngScoreDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/dto/UpdateLngScoreDto.java index 10ab265..40944cd 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 @@ -45,7 +45,7 @@ public class UpdateLngScoreDto implements Serializable { */ @LogField(name="评分日期",index=1) @ApiModelProperty("评分日期") - @JsonFormat(pattern = "HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime dateGrade; /** @@ -104,7 +104,7 @@ public class UpdateLngScoreDto implements Serializable { @ApiModelProperty("lngScoreDtl子表") @LogJoin(name = "lngScoreDtl子表", columns = { - @LogJoinColumn(field = "sId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "sId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngScoreDtlDto.class, type = JoinType.MANY) private List lngScoreDtlList; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java index b73566c..b03cde1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScorePageVo.java @@ -28,7 +28,7 @@ public class LngScorePageVo { * 评分日期 */ @ApiModelProperty("评分日期") - @JsonFormat(pattern = "HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime dateGrade; /** * 评价体系主键 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java index 248fc62..18c4e70 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -128,5 +130,11 @@ public class LngScoreVo { */ @ApiModelProperty("lngScoreDtl子表") private List lngScoreDtlList; + + /** + * lngFileUpload + */ + @ApiModelProperty("lngFileUpload子表") + private List lngFileUploadList; } 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 f6413ae..ad744d6 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 @@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.utils.StringUtils; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; @@ -22,6 +25,7 @@ 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.LngScorePageDto; +import com.xjrsoft.module.sales.dto.UpdateLngCustomerGroupDto; import com.xjrsoft.module.sales.dto.UpdateLngScoreDto; import com.xjrsoft.module.sales.entity.LngScore; import com.xjrsoft.module.sales.service.IScoreCustomerService; @@ -43,7 +47,7 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/sales" + "/scoreCustomer") +@RequestMapping("/sales/scoreCustomer") @Api(value = "/sales" + "/scoreCustomer",tags = "客户评价代码") @AllArgsConstructor public class CustomerScoreController { @@ -65,6 +69,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()) + .eq(LngScore::getTableName, "lng_customer") .orderByDesc(LngScore::getId); IPage page = scoreCustomerService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngScorePageVo.class); @@ -75,11 +80,7 @@ public class CustomerScoreController { @ApiOperation(value="根据id查询LngScore信息") @SaCheckPermission("scoreCustomer:detail") public R info(@RequestParam Long id){ - LngScore lngScore = scoreCustomerService.getByIdDeep(id); - if (lngScore == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngScore, LngScoreVo.class)); + return R.ok(scoreCustomerService.getInfoById(id)); } @GetMapping(value = "/datalog") @@ -95,14 +96,29 @@ public class CustomerScoreController { @ApiOperation(value = "新增LngScore") @SaCheckPermission("scoreCustomer:add") public R add(@Valid @RequestBody UpdateLngScoreDto dto){ - UpdateLngScoreDto res = dataService.insert(dto); - return R.ok(res.getId()); + if(StringUtils.isEmpty(dto.getTableName())) { + dto.setTableName("lng_customer"); + } + UpdateLngScoreDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngScoreDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngScoreDto after(DataOperationContent content) { + //execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + }); + return R.ok(res); } @PutMapping @ApiOperation(value = "修改LngScore") @SaCheckPermission("scoreCustomer:edit") public R update(@Valid @RequestBody UpdateLngScoreDto dto){ + return R.ok(dataService.updateById(dto)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScore.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScore.java index aff86ca..1bfd0f3 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScore.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngScore.java @@ -1,20 +1,24 @@ package com.xjrsoft.module.sales.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/controller/SupplierScoreController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java index f6d4bdd..7065812 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java @@ -15,10 +15,12 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.datalog.DataOperationContent; +import com.pictc.datalog.DataOperationListener; +import com.pictc.utils.StringUtils; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; 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.supplier.dto.LngScorePageDto; @@ -43,7 +45,7 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/supplier" + "/scoreSupplier") +@RequestMapping("/supplier/scoreSupplier") @Api(value = "/supplier" + "/scoreSupplier",tags = "供应商评价代码") @AllArgsConstructor public class SupplierScoreController { @@ -65,8 +67,8 @@ public class SupplierScoreController { .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())); + .eq(LngScore::getTableName, "lng_supplier") + .orderByDesc(LngScore::getId); IPage page = scoreSupplierService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngScorePageVo.class); return R.ok(pageOutput); @@ -76,11 +78,7 @@ public class SupplierScoreController { @ApiOperation(value="根据id查询LngScore信息") @SaCheckPermission("scoreSupplier:detail") public R info(@RequestParam Long id){ - LngScore lngScore = scoreSupplierService.getByIdDeep(id); - if (lngScore == null) { - return R.error("找不到此数据！"); - } - return R.ok(BeanUtil.toBean(lngScore, LngScoreVo.class)); + return R.ok(scoreSupplierService.getInfoById(id)); } @GetMapping(value = "/datalog") @@ -96,8 +94,21 @@ public class SupplierScoreController { @ApiOperation(value = "新增LngScore") @SaCheckPermission("scoreSupplier:add") public R add(@Valid @RequestBody UpdateLngScoreDto dto){ - UpdateLngScoreDto res = dataService.insert(dto); - return R.ok(res.getId()); + if(StringUtils.isEmpty(dto.getTableName())) { + dto.setTableName("lng_supplier"); + } + UpdateLngScoreDto res = dataService.insert(dto, new DataOperationListener() { + @Override + public UpdateLngScoreDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngScoreDto after(DataOperationContent content) { + return content.getObj(); + } + }); + return R.ok(res); } @PutMapping @@ -111,7 +122,7 @@ public class SupplierScoreController { @ApiOperation(value = "删除") @SaCheckPermission("scoreSupplier:delete") public R delete(@Valid @RequestBody List ids){ - return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids)); + return R.ok(dataService.deleteByIds(UpdateLngScoreDto.class, ids)); } 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 2d1c743..7808edb 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 @@ -1,12 +1,12 @@ package com.xjrsoft.module.supplier.service; -import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + 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.supplier.entity.LngScore; -import lombok.Data; -import java.util.List; +import com.xjrsoft.module.supplier.vo.LngScoreVo; /** * @title: service @@ -16,21 +16,7 @@ import java.util.List; */ public interface IScoreSupplierService extends MPJBaseService, MPJDeepService, MPJRelationService { - /** - * 新增 - * - * @param lngScore - * @return - */ - Boolean add(LngScore lngScore); - - /** - * 更新 - * - * @param lngScore - * @return - */ - Boolean update(LngScore lngScore); + /** * 删除 @@ -39,4 +25,6 @@ public interface IScoreSupplierService 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/supplier/service/impl/ScoreSupplierServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/ScoreSupplierServiceImpl.java deleted file mode 100644 index 45ee9d5..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/ScoreSupplierServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.xjrsoft.module.supplier.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; -import com.xjrsoft.module.supplier.entity.LngScoreDtl; -import com.xjrsoft.module.supplier.mapper.LngSupplierScoreDtlMapper; -import com.xjrsoft.module.supplier.entity.LngScore; -import com.xjrsoft.module.supplier.mapper.LngSupplierScoreMapper; -import com.xjrsoft.module.supplier.service.IScoreSupplierService; -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 ScoreSupplierServiceImpl extends MPJBaseServiceImpl implements IScoreSupplierService { - private final LngSupplierScoreMapper scoreSupplierLngScoreMapper; - - private final LngSupplierScoreDtlMapper scoreSupplierLngScoreDtlMapper; - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean add(LngScore lngScore) { - scoreSupplierLngScoreMapper.insert(lngScore); - for (LngScoreDtl lngScoreDtl : lngScore.getLngScoreDtlList()) { - lngScoreDtl.setSId(lngScore.getId()); - scoreSupplierLngScoreDtlMapper.insert(lngScoreDtl); - } - - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean update(LngScore lngScore) { - scoreSupplierLngScoreMapper.updateById(lngScore); - //********************************* LngScoreDtl 增删改 开始 *******************************************/ - { - // 查出所有子级的id - List lngScoreDtlList = scoreSupplierLngScoreDtlMapper.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) { - scoreSupplierLngScoreDtlMapper.updateById(lngScoreDtl); - } - //如果等于空 则新增 - else { - //已经不存在的id 删除 - lngScoreDtl.setSId(lngScore.getId()); - scoreSupplierLngScoreDtlMapper.insert(lngScoreDtl); - } - } - //已经不存在的id 删除 - if(lngScoreDtlRemoveIds.size() > 0){ - scoreSupplierLngScoreDtlMapper.deleteBatchIds(lngScoreDtlRemoveIds); - } - } - //********************************* LngScoreDtl 增删改 结束 *******************************************/ - - return true; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean delete(List ids) { - scoreSupplierLngScoreMapper.deleteBatchIds(ids); - scoreSupplierLngScoreDtlMapper.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/service/impl/SupplierScoreServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java new file mode 100644 index 0000000..ef0fd9f --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierScoreServiceImpl.java @@ -0,0 +1,61 @@ +package com.xjrsoft.module.supplier.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.supplier.entity.LngScoreDtl; +import com.xjrsoft.module.supplier.mapper.LngSupplierScoreDtlMapper; +import com.xjrsoft.module.supplier.entity.LngScore; +import com.xjrsoft.module.supplier.mapper.LngSupplierScoreMapper; +import com.xjrsoft.module.supplier.service.IScoreSupplierService; +import com.xjrsoft.module.supplier.vo.LngScoreVo; +import com.xjrsoft.module.system.client.IFileClient; +import com.xjrsoft.module.system.vo.LngFileUploadVo; + +import cn.hutool.core.bean.BeanUtil; +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 SupplierScoreServiceImpl extends MPJBaseServiceImpl implements IScoreSupplierService { + + private final LngSupplierScoreMapper scoreSupplierLngScoreMapper; + + private final LngSupplierScoreDtlMapper scoreSupplierLngScoreDtlMapper; + + private final IFileClient fileClient; + + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean delete(List ids) { + scoreSupplierLngScoreMapper.deleteBatchIds(ids); + scoreSupplierLngScoreDtlMapper.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_supplier", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); + return vo; + } +} From 52af6011dfe9040d82149db639dd3d1aa2ec9f01 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 19 Dec 2025 16:49:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=AF=84?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/supplier/service/impl/SupplierScoreServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ef0fd9f..7ebf562 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 @@ -54,7 +54,7 @@ public class SupplierScoreServiceImpl extends MPJBaseServiceImpl fileList = fileClient.getTableFiles("lng_supplier", "lngFileUploadList", vo.getId()); + List fileList = fileClient.getTableFiles("lng_score", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); return vo; } From 4b1a419c2345a744fe5ec7ed9007c2628d64c898 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 19 Dec 2025 17:44:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86/=E5=AE=A2?= =?UTF-8?q?=E6=88=B7-=E8=AF=84=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/sales/vo/LngScorePageVo.java | 2 +- .../xjrsoft/module/sales/vo/LngScoreVo.java | 14 +++++++++++ .../module/supplier/vo/LngScoreVo.java | 15 +++++++++++ .../impl/PlaceLngUnloadServiceImpl.java | 10 +++----- .../controller/CustomerScoreController.java | 13 +++++++++- .../impl/CustomerScoreServiceImpl.java | 25 ++++++++++++------- .../controller/SupplierScoreController.java | 14 ++++++++--- .../supplier/service/ISupplierService.java | 2 ++ .../impl/SupplierScoreServiceImpl.java | 23 ++++++++++++++--- .../service/impl/SupplierServiceImpl.java | 8 +++--- 10 files changed, 98 insertions(+), 28 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java index 24bbea3..2d1765c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java @@ -34,7 +34,7 @@ public class LngScorePageVo { * 评价体系主键 */ @ApiModelProperty("评价体系主键") - @Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") + //@Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") private String gsId; /** * 供应商/客户 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 1bf6774..a12a298 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,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.module.supplier.vo.LngScoreDtlVo; import com.xjrsoft.module.system.vo.LngFileUploadVo; @@ -134,5 +136,17 @@ public class LngScoreVo { */ @ApiModelProperty("lngFileUpload子表") private List lngFileUploadList; + + @Trans(type = TransType.DIC, id = "1990668094164484097", transToFieldName = "cpClassName") + private String cpClassCode; + + private String cpClassName; + + /** + * 供应商/客户 + */ + @ApiModelProperty("供应商/客户名称") + private String cpName; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java index 18c4e70..2035e7d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngScoreVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; @@ -136,5 +138,18 @@ public class LngScoreVo { */ @ApiModelProperty("lngFileUpload子表") private List lngFileUploadList; + + + + @Trans(type = TransType.DIC, id = "1990668094164484097", transToFieldName = "cpClassName") + private String cpClassCode; + + private String cpClassName; + + /** + * 供应商/客户 + */ + @ApiModelProperty("供应商/客户名称") + private String cpName; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java index 33ab535..cce1247 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PlaceLngUnloadServiceImpl.java @@ -1,17 +1,13 @@ package com.xjrsoft.module.mdm.service.impl; +import org.springframework.stereotype.Service; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; import com.xjrsoft.module.mdm.entity.LngBPlaceLngUnload; import com.xjrsoft.module.mdm.mapper.LngBPlaceLngUnloadMapper; import com.xjrsoft.module.mdm.service.IPlaceLngUnloadService; + 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 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 ad744d6..9fdd4d7 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 @@ -119,7 +119,18 @@ public class CustomerScoreController { @SaCheckPermission("scoreCustomer:edit") public R update(@Valid @RequestBody UpdateLngScoreDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngScoreDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngScoreDto after(DataOperationContent content) { + //execAfter(content.getTableName(), content.getIdValue(), "I"); + return content.getObj(); + } + })); } @DeleteMapping 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 index a01553c..00ca0eb 100644 --- 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 @@ -1,28 +1,25 @@ 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.conditions.query.LambdaQueryWrapper; 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.LngCustomerMapper; 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; /** @@ -34,9 +31,12 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class CustomerScoreServiceImpl extends MPJBaseServiceImpl implements IScoreCustomerService { - private final LngCustomerScoreMapper scoreCustomerLngScoreMapper; + private final LngCustomerScoreMapper customerScoreMapper; + + private final LngCustomerScoreDtlMapper customerScoreDtlMapper; + + private final LngCustomerMapper customerMapper; - private final LngCustomerScoreDtlMapper scoreCustomerLngScoreDtlMapper; private final IFileClient fileClient; @@ -44,8 +44,8 @@ public class CustomerScoreServiceImpl extends MPJBaseServiceImpl ids) { - scoreCustomerLngScoreMapper.deleteBatchIds(ids); - scoreCustomerLngScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); + customerScoreMapper.deleteBatchIds(ids); + customerScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); return true; } @@ -57,6 +57,13 @@ public class CustomerScoreServiceImpl extends MPJBaseServiceImpl() + .eq(LngCustomer::getCuCode, vo.getCpCode())); + if(customer != null) { + vo.setCpClassCode(customer.getClassCode()); + vo.setCpName(customer.getCuName()); + } + 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/supplier/controller/SupplierScoreController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java index 7065812..e1da27e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierScoreController.java @@ -28,10 +28,8 @@ import com.xjrsoft.module.supplier.dto.UpdateLngScoreDto; import com.xjrsoft.module.supplier.entity.LngScore; import com.xjrsoft.module.supplier.service.IScoreSupplierService; import com.xjrsoft.module.supplier.vo.LngScorePageVo; -import com.xjrsoft.module.supplier.vo.LngScoreVo; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; @@ -115,7 +113,17 @@ public class SupplierScoreController { @ApiOperation(value = "修改LngScore") @SaCheckPermission("scoreSupplier:edit") public R update(@Valid @RequestBody UpdateLngScoreDto dto){ - return R.ok(dataService.updateById(dto)); + return R.ok(dataService.updateById(dto, new DataOperationListener() { + @Override + public UpdateLngScoreDto before(DataOperationContent content) { + return null; + } + + @Override + public UpdateLngScoreDto after(DataOperationContent content) { + return content.getObj(); + } + })); } @DeleteMapping diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java index 8f6d64e..4cb6661 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/ISupplierService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; 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.supplier.dto.UpdateLngSupplierDto; import com.xjrsoft.module.supplier.entity.LngSupplier; import com.xjrsoft.module.supplier.vo.LngSupplierVo; @@ -29,4 +30,5 @@ public interface ISupplierService extends MPJBaseService, MPJDeepSe Boolean delete(List ids); LngSupplierVo getSupplierById(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 7ebf562..83cf18b 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 @@ -3,7 +3,11 @@ package com.xjrsoft.module.supplier.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.base.MPJBaseServiceImpl; import com.xjrsoft.module.supplier.entity.LngScoreDtl; +import com.xjrsoft.module.supplier.entity.LngSupplier; +import com.xjrsoft.module.supplier.mapper.LngSupplierMapper; import com.xjrsoft.module.supplier.mapper.LngSupplierScoreDtlMapper; +import com.xjrsoft.module.mdm.entity.LngBRegion; +import com.xjrsoft.module.supplier.dto.UpdateLngSupplierDto; import com.xjrsoft.module.supplier.entity.LngScore; import com.xjrsoft.module.supplier.mapper.LngSupplierScoreMapper; import com.xjrsoft.module.supplier.service.IScoreSupplierService; @@ -18,6 +22,8 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; /** @@ -30,9 +36,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; @AllArgsConstructor public class SupplierScoreServiceImpl extends MPJBaseServiceImpl implements IScoreSupplierService { - private final LngSupplierScoreMapper scoreSupplierLngScoreMapper; + private final LngSupplierScoreMapper supplierScoreMapper; - private final LngSupplierScoreDtlMapper scoreSupplierLngScoreDtlMapper; + private final LngSupplierScoreDtlMapper supplierScoreDtlMapper; + + private final LngSupplierMapper supplierMapper; private final IFileClient fileClient; @@ -40,8 +48,8 @@ public class SupplierScoreServiceImpl extends MPJBaseServiceImpl ids) { - scoreSupplierLngScoreMapper.deleteBatchIds(ids); - scoreSupplierLngScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); + supplierScoreMapper.deleteBatchIds(ids); + supplierScoreDtlMapper.delete(Wrappers.lambdaQuery(LngScoreDtl.class).in(LngScoreDtl::getSId, ids)); return true; } @@ -54,6 +62,13 @@ public class SupplierScoreServiceImpl extends MPJBaseServiceImpl() + .eq(LngSupplier::getSuCode, vo.getCpCode())); + if(supplier != null) { + vo.setCpClassCode(supplier.getClassCode()); + vo.setCpName(supplier.getSuName()); + } + 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/supplier/service/impl/SupplierServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java index c58994b..d5249ab 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/service/impl/SupplierServiceImpl.java @@ -7,6 +7,7 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.xjrsoft.module.supplier.dto.UpdateLngSupplierDto; import com.xjrsoft.module.supplier.entity.LngSupplier; import com.xjrsoft.module.supplier.entity.LngSupplierBank; import com.xjrsoft.module.supplier.entity.LngSupplierContact; @@ -34,7 +35,7 @@ import lombok.AllArgsConstructor; @Service @AllArgsConstructor public class SupplierServiceImpl extends MPJBaseServiceImpl implements ISupplierService { - private final LngSupplierMapper supplierLngSupplierMapper; + private final LngSupplierMapper supplierMapper; private final LngSupplierBankMapper supplierLngSupplierBankMapper; private final LngSupplierContactMapper supplierLngSupplierContactMapper; @@ -45,7 +46,7 @@ public class SupplierServiceImpl extends MPJBaseServiceImpl ids) { - supplierLngSupplierMapper.deleteBatchIds(ids); + supplierMapper.deleteBatchIds(ids); supplierLngSupplierBankMapper.delete(Wrappers.lambdaQuery(LngSupplierBank.class).in(LngSupplierBank::getSuCode, ids)); supplierLngSupplierContactMapper.delete(Wrappers.lambdaQuery(LngSupplierContact.class).in(LngSupplierContact::getSuCode, ids)); supplierLngSupplierDocMapper.delete(Wrappers.lambdaQuery(LngSupplierDoc.class).in(LngSupplierDoc::getSuCode, ids)); @@ -70,6 +71,7 @@ public class SupplierServiceImpl extends MPJBaseServiceImpl Date: Mon, 22 Dec 2025 17:48:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=20#789?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CountryRegionController.java | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java index 8870303..1dc6b4c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.pictc.constant.FieldNameConstants; import com.pictc.datalog.DataOperationContent; import com.pictc.datalog.DataOperationListener; import com.pictc.enums.BusinessCode; @@ -129,17 +130,18 @@ public class CountryRegionController { }else { dto.setFullPath(dto.getFullName()); } + checkParams(dto); return content.getObj(); } @Override public UpdateLngBRegionDto after(DataOperationContent content) { String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } - UpdateLngBRegionDto obj = content.getObj(); - tranProvider.saveData(obj.getCode(), obj.getFullName()); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + UpdateLngBRegionDto obj = content.getObj(); + tranProvider.saveData(obj.getCode(), obj.getFullName()); return content.getObj(); } })); @@ -164,15 +166,16 @@ public class CountryRegionController { }else { dto.setFullPath(dto.getFullName()); } + checkParams(dto); return content.getObj(); } @Override public UpdateLngBRegionDto after(DataOperationContent content) { String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); - if (StringUtils.isNotBlank(msg)) { - throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); - } + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } UpdateLngBRegionDto obj = content.getObj(); tranProvider.saveData(obj.getCode(), obj.getFullName()); return content.getObj(); @@ -241,6 +244,22 @@ public class CountryRegionController { return R.ok(countryRegionService.getParentByCode(code,excludeType,startPCode)); } + + + private void checkParams(UpdateLngBRegionDto dto) { + Long codeCount = countryRegionService.count(new LambdaQueryWrapper() + .eq(LngBRegion::getCode, dto.getCode()).ne(dto.getId() != null, LngBRegion::getId, dto.getId())); + if (codeCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.CODE)); + } + Long nameCount = countryRegionService.count(new LambdaQueryWrapper() + .eq(LngBRegion::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBRegion::getId, dto.getId())); + if (nameCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.FULL_NAME)); + } + } } \ No newline at end of file