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 15:56:24 +08:00
parent 18a9fa1bf9
commit 1b82112b61
11 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java
View File

@ -58,6 +58,13 @@ public class LngCustomerPageVo {
@ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)")
@Trans(type = TransType.DIC, id = "1990668471983194113")
private String typeCode;
/**
* 国际/国内(I-国际，D-国内)
*/
@ApiModelProperty("国际/国内(I-国际，D-国内)")
@Trans(type = TransType.DIC, id = "1990667691045732354")
private String dI;
/**
* 有效标志（不在黑名单）(Y-有效，N-无效)
*/

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
View File

@ -116,6 +116,9 @@ public class CountryRegionController {
@Override
public UpdateLngBRegionDto before(DataOperationContent<UpdateLngBRegionDto> content) {
if(dto.getPid() == null) {
dto.setPid(0L);
}
if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) {
if(dto.getPid() != null && dto.getPid() != 0) {
LngBRegion parentRegion = countryRegionService.getById(dto.getPid());

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java
View File

@ -134,6 +134,8 @@ public class DocCpController {
queryWrapper
.like(StrUtil.isNotBlank(dto.getFullName()), LngBDocCp::getFullName, dto.getFullName())
.eq(StrUtil.isNotBlank(dto.getValid()), LngBDocCp::getValid, dto.getValid())
.eq(StrUtil.isNotBlank(dto.getSuSign()), LngBDocCp::getSuSign, dto.getSuSign())
.eq(StrUtil.isNotBlank(dto.getCuSign()), LngBDocCp::getCuSign, dto.getCuSign())
.orderByDesc(LngBDocCp::getCode);
List<LngBDocCpVo> voList = CollectionUtils.newArrayList();
List<LngBDocCp> docList = docCpService.list(queryWrapper);

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

@ -50,10 +50,16 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
List<String> excludeTypeList = CollectionUtils.newArrayList();
if(StringUtils.isNotBlank(startPCode)) {
LambdaQueryWrapper<LngBRegion> qw = new LambdaQueryWrapper<LngBRegion>();
if("CHN".equals(startPCode)) {
startPCode = "1001";
}
qw.eq(LngBRegion::getCode,startPCode);
LngBRegion tempPr = this.getOne(qw);
if(tempPr != null) {
excludeTypeList.add(tempPr.getRegionTypeCode());
}
}
if(StringUtils.isNotBlank(excludeType)) {
excludeTypeList.add(excludeType);
}
@ -122,7 +128,9 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
if(pid == null) {
pid = 0L;
}
if("CHN".equals(startPCode)) {
startPCode = "1001";
}
if(StrUtil.isNotBlank(startPCode) && (pid == null || pid ==0) ){
List<LngBRegion> pList = this.list(Wrappers.<LngBRegion>query()
.lambda().eq(LngBRegion::getCode, startPCode));

34
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplier.java
View File

@ -1,20 +1,23 @@
package com.xjrsoft.module.supplier.entity;
import java.io.Serializable;
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;
/**
@ -218,6 +221,11 @@ public class LngSupplier implements Serializable {
@ApiModelProperty("lngSupplierBank子表")
@TableField(exist = false)
@EntityMapping(thisField = "suCode", joinField = "suCode")
@LogJoin(name = "供应商银行信息",
columns = {
@LogJoinColumn(field = "suCode",relatedField = "suCode", valueDirection = ValueDirectionType.RIGHT)
}, caseType = JoinCaseType.FULL, target = LngSupplierBank.class, type = JoinType.MANY)
private List<LngSupplierBank> lngSupplierBankList;
/**
* lngSupplierContact
@ -225,6 +233,11 @@ public class LngSupplier implements Serializable {
@ApiModelProperty("lngSupplierContact子表")
@TableField(exist = false)
@EntityMapping(thisField = "suCode", joinField = "suCode")
@LogJoin(name = "供应商联系人信息",
columns = {
@LogJoinColumn(field = "suCode",relatedField = "suCode", valueDirection = ValueDirectionType.RIGHT)
}, caseType = JoinCaseType.FULL, target = LngSupplierContact.class, type = JoinType.MANY)
private List<LngSupplierContact> lngSupplierContactList;
/**
* lngSupplierDoc
@ -232,6 +245,11 @@ public class LngSupplier implements Serializable {
@ApiModelProperty("lngSupplierDoc子表")
@TableField(exist = false)
@EntityMapping(thisField = "suCode", joinField = "suCode")
@LogJoin(name = "供应商资质信息",
columns = {
@LogJoinColumn(field = "suCode",relatedField = "suCode", valueDirection = ValueDirectionType.RIGHT)
}, caseType = JoinCaseType.FULL, target = LngSupplierDoc.class, type = JoinType.MANY)
private List<LngSupplierDoc> lngSupplierDocList;
}

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierBankMapper.java
View File

@ -2,6 +2,7 @@ package com.xjrsoft.module.supplier.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.sales.entity.LngCustomer;
import com.xjrsoft.module.supplier.entity.LngSupplierBank;
import org.apache.ibatis.annotations.Mapper;
@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
* @Version 1.0
*/
@Mapper
public interface LngSupplierBankMapper extends MPJBaseMapper<LngSupplierBank> {
public interface LngSupplierBankMapper extends MPJBaseMapper<LngSupplierBank>,BaseMapper<LngSupplierBank> {
}

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierContactMapper.java
View File

@ -2,6 +2,7 @@ package com.xjrsoft.module.supplier.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.supplier.entity.LngSupplierBank;
import com.xjrsoft.module.supplier.entity.LngSupplierContact;
import org.apache.ibatis.annotations.Mapper;
@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
* @Version 1.0
*/
@Mapper
public interface LngSupplierContactMapper extends MPJBaseMapper<LngSupplierContact> {
public interface LngSupplierContactMapper extends MPJBaseMapper<LngSupplierContact>,BaseMapper<LngSupplierContact> {
}

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierDocMapper.java
View File

@ -2,6 +2,7 @@ package com.xjrsoft.module.supplier.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.supplier.entity.LngSupplierContact;
import com.xjrsoft.module.supplier.entity.LngSupplierDoc;
import org.apache.ibatis.annotations.Mapper;
@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
* @Version 1.0
*/
@Mapper
public interface LngSupplierDocMapper extends MPJBaseMapper<LngSupplierDoc> {
public interface LngSupplierDocMapper extends MPJBaseMapper<LngSupplierDoc>,BaseMapper<LngSupplierDoc> {
}

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierMapper.java
View File

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

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreDtlMapper.java
View File

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

5
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java
View File

@ -1,9 +1,10 @@
package com.xjrsoft.module.supplier.mapper;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.supplier.entity.LngScore;
import org.apache.ibatis.annotations.Mapper;
/**
* @title: mapper
@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
* @Version 1.0
*/
@Mapper
public interface LngSupplierScoreMapper extends MPJBaseMapper<LngScore> {
public interface LngSupplierScoreMapper extends MPJBaseMapper<LngScore>,BaseMapper<LngScore> {
}