geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

供应商

Browse Source
This commit is contained in:
shunyi.kuang
2025-12-18 17:04:44 +08:00
parent aff9056f60
commit 99f3508cbb
9 changed files with 73 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngCustomerDto.java
View File

@ -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<AddLngFileUploadDto> lngFileUploadList;
private List<UpdateLngFileUploadDto> lngFileUploadList;
}

90
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java
View File

@ -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;
}

25
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierPageVo.java
View File

@ -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;
}

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ScoreCustomerController.java → itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerScoreController.java
View File

@ -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;

23
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/GradeSystemController.java
View File

@ -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<LngGradeSystem> 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<LngGradeSystem> list = gradeSystemService.list(queryWrapper);
List<LngGradeSystemVo> voList = CollectionUtils.newArrayList();
for(LngGradeSystem s:list) {
LngGradeSystemVo vo = new LngGradeSystemVo();
BeanUtil.copyProperties(s, vo);
voList.add(vo);
}
return R.ok(voList);
}

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngScoreDtlMapper.java → itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreDtlMapper.java
View File

@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
* @Version 1.0
*/
@Mapper
public interface LngScoreDtlMapper extends MPJBaseMapper<LngScoreDtl> {
public interface LngCustomerScoreDtlMapper extends MPJBaseMapper<LngScoreDtl>,BaseMapper<LngScoreDtl> {
}

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngScoreMapper.java → itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerScoreMapper.java
View File

@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
* @Version 1.0
*/
@Mapper
public interface LngScoreMapper extends MPJBaseMapper<LngScore> {
public interface LngCustomerScoreMapper extends MPJBaseMapper<LngScore>,BaseMapper<LngScore> {
}

10
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/ScoreCustomerServiceImpl.java
View File

@ -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<LngScoreMapper, LngScore> implements IScoreCustomerService {
private final LngScoreMapper scoreCustomerLngScoreMapper;
public class ScoreCustomerServiceImpl extends MPJBaseServiceImpl<LngCustomerScoreMapper, LngScore> implements IScoreCustomerService {
private final LngCustomerScoreMapper scoreCustomerLngScoreMapper;
private final LngScoreDtlMapper scoreCustomerLngScoreDtlMapper;
private final LngCustomerScoreDtlMapper scoreCustomerLngScoreDtlMapper;
@Override

40
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/ScoreSupplierController.java
View File

@ -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: 供应商评价