From 99f3508cbbf11791281088978ee5deb308323df6 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 18 Dec 2025 17:04:44 +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 --- .../module/sales/dto/AddLngCustomerDto.java | 3 +- .../module/sales/dto/AddLngFileUploadDto.java | 90 ------------------- .../module/supplier/vo/LngSupplierPageVo.java | 25 ++++-- ...ller.java => CustomerScoreController.java} | 2 +- .../controller/GradeSystemController.java | 23 +++++ ...er.java => LngCustomerScoreDtlMapper.java} | 2 +- ...apper.java => LngCustomerScoreMapper.java} | 2 +- .../impl/ScoreCustomerServiceImpl.java | 10 +-- .../controller/ScoreSupplierController.java | 40 +++++---- 9 files changed, 73 insertions(+), 124 deletions(-) delete mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/{ScoreCustomerController.java => CustomerScoreController.java} (99%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/{LngScoreDtlMapper.java => LngCustomerScoreDtlMapper.java} (76%) rename itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/{LngScoreMapper.java => LngCustomerScoreMapper.java} (77%) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java index 4248ef2..6b3a22a 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java @@ -7,6 +7,7 @@ import java.util.List; import com.pictc.annotations.datalog.LogField; import com.pictc.annotations.datalog.LogTable; +import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -231,5 +232,5 @@ public class AddLngCustomerDto implements Serializable { * lngFileUpload */ @ApiModelProperty("lngFileUpload子表") - private List lngFileUploadList; + private List lngFileUploadList; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java deleted file mode 100644 index 20407ef..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.xjrsoft.module.sales.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import java.io.Serializable; -import com.fasterxml.jackson.annotation.JsonFormat; - -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.util.List; - -import com.pictc.annotations.datalog.LogField; -import com.pictc.annotations.datalog.LogTable; - - - - -/** -* @title: 客户 -* @Author 管理员 -* @Date: 2025-11-21 -* @Version 1.0 -*/ -@Data -@LogTable(source="lng_file_upload",name="客户") -public class AddLngFileUploadDto implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private String tableName; - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private Long tableId; - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private String columnName; - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private String fileOrg; - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private String filePath; - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private Long fileSize; - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private String docDesc; - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private Short sort; - /** - * - */ - @ApiModelProperty("") - @LogField(name="",index=0) - private Long tenantId; - - @LogField(name="",index=10) - @ApiModelProperty("") - private Long xjrFileId; - -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierPageVo.java index 2ca925e..ec8fbc6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierPageVo.java @@ -1,14 +1,10 @@ package com.xjrsoft.module.supplier.vo; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.enums.TransType; -import java.time.LocalTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * @title: 分页列表出参 @@ -24,6 +20,12 @@ public class LngSupplierPageVo { */ @ApiModelProperty("主键") private String id; + + /** + * 供应商编码名称(不能与名称、简称重复) + */ + @ApiModelProperty("供应商编码") + private String suCode; /** * 供应商名称(不能与名称、简称重复) */ @@ -38,31 +40,40 @@ public class LngSupplierPageVo { * 国际/国内(I-国际，D-国内) */ @ApiModelProperty("国际/国内(I-国际，D-国内)") + @Trans(type = TransType.DIC, id = "1990667691045732354") private String dI; /** * 企业性质(国有企业/非国有企业) */ @ApiModelProperty("企业性质(国有企业/非国有企业)") + @Trans(type = TransType.DIC, id = "1990667133987635201") private String natureCode; /** * 供应商分类(一类/二类) */ @ApiModelProperty("供应商分类(一类/二类)") + @Trans(type = TransType.DIC, id = "1990668094164484097") private String classCode; /** * 供应商类别(资源方/贸易商/托运商/接收站/多领域) */ @ApiModelProperty("供应商类别(资源方/贸易商/托运商/接收站/多领域)") + @Trans(type = TransType.DIC, id = "1996842517347475457") private String typeCode; /** * 有效标志(Y-有效，N-无效) */ @ApiModelProperty("有效标志(Y-有效，N-无效)") + @Trans(type = TransType.DIC, id = "1978057078528327681") private String valid; /** * 状态(未提交/审批中/已审批/已驳回) */ @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") private String approCode; + + @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") + private String approName; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ScoreCustomerController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java similarity index 99% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ScoreCustomerController.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java index 6f9da7b..cbaecb1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ScoreCustomerController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java @@ -46,7 +46,7 @@ import lombok.AllArgsConstructor; @RequestMapping("/sales" + "/scoreCustomer") @Api(value = "/sales" + "/scoreCustomer",tags = "客户评价代码") @AllArgsConstructor -public class ScoreCustomerController { +public class CustomerScoreController { private final IScoreCustomerService scoreCustomerService; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java index 11e30be..a64041b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java @@ -7,12 +7,15 @@ 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.CollectionUtils; 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.mdm.entity.LngBStationLng; +import com.xjrsoft.module.mdm.vo.LngBStationLngVo; import com.xjrsoft.module.sales.dto.LngGradeSystemPageDto; import com.xjrsoft.module.sales.dto.UpdateLngGradeSystemDto; import com.xjrsoft.module.sales.entity.LngGradeSystem; @@ -143,6 +146,26 @@ public class GradeSystemController { } })); } + + @GetMapping(value = "/list") + @ApiOperation(value="LngGradeSystem列表(不分页)") + public R list(@Valid LngGradeSystemPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getGsName()),LngGradeSystem::getGsName,dto.getGsName()) + .like(StrUtil.isNotBlank(dto.getTypeCode()),LngGradeSystem::getTypeCode,dto.getTypeCode()) + .eq(StrUtil.isNotBlank(dto.getValid()),LngGradeSystem::getValid,dto.getValid()) + .orderByDesc(LngGradeSystem::getId); + List list = gradeSystemService.list(queryWrapper); + List voList = CollectionUtils.newArrayList(); + for(LngGradeSystem s:list) { + LngGradeSystemVo vo = new LngGradeSystemVo(); + BeanUtil.copyProperties(s, vo); + voList.add(vo); + } + return R.ok(voList); + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngScoreDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreDtlMapper.java similarity index 76% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngScoreDtlMapper.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreDtlMapper.java index 38735b5..9227ca4 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngScoreDtlMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreDtlMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngScoreDtlMapper extends MPJBaseMapper { +public interface LngCustomerScoreDtlMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngScoreMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreMapper.java similarity index 77% rename from itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngScoreMapper.java rename to itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreMapper.java index 1b14c5e..373d174 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngScoreMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngScoreMapper extends MPJBaseMapper { +public interface LngCustomerScoreMapper extends MPJBaseMapper,BaseMapper { } 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 index 88f7b89..5b60139 100644 --- 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 @@ -3,9 +3,9 @@ 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.LngScoreDtlMapper; +import com.xjrsoft.module.sales.mapper.LngCustomerScoreDtlMapper; import com.xjrsoft.module.sales.entity.LngScore; -import com.xjrsoft.module.sales.mapper.LngScoreMapper; +import com.xjrsoft.module.sales.mapper.LngCustomerScoreMapper; import com.xjrsoft.module.sales.service.IScoreCustomerService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -23,10 +23,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; */ @Service @AllArgsConstructor -public class ScoreCustomerServiceImpl extends MPJBaseServiceImpl implements IScoreCustomerService { - private final LngScoreMapper scoreCustomerLngScoreMapper; +public class ScoreCustomerServiceImpl extends MPJBaseServiceImpl implements IScoreCustomerService { + private final LngCustomerScoreMapper scoreCustomerLngScoreMapper; - private final LngScoreDtlMapper scoreCustomerLngScoreDtlMapper; + private final LngCustomerScoreDtlMapper scoreCustomerLngScoreDtlMapper; @Override 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/ScoreSupplierController.java index 7f9ecc4..ddd80e9 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/ScoreSupplierController.java @@ -1,36 +1,40 @@ package com.xjrsoft.module.supplier.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.xjrsoft.common.constant.GlobalConstant; -import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; -import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.utils.VoToColumnUtil; -import com.xjrsoft.module.supplier.dto.AddLngScoreDto; -import com.xjrsoft.module.supplier.dto.UpdateLngScoreDto; -import cn.dev33.satoken.annotation.SaCheckPermission; - +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.supplier.dto.LngScorePageDto; +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.datalog.vo.DataChangeLogVo; -import com.xjrsoft.module.datalog.service.DatalogService; 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; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import java.util.List; /** * @title: 供应商评价