diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java index d8c563a..ad1c452 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerPageVo.java @@ -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-无效) */ 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 1e4d2b5..8870303 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 @@ -116,6 +116,9 @@ public class CountryRegionController { @Override public UpdateLngBRegionDto before(DataOperationContent 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()); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java index 90a89b7..e918cad 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/DocCpController.java @@ -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 voList = CollectionUtils.newArrayList(); List docList = docCpService.list(queryWrapper); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java index a6e3a3a..501f3c0 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -50,9 +50,15 @@ public class CountryRegionServiceImpl extends ServiceImpl excludeTypeList = CollectionUtils.newArrayList(); if(StringUtils.isNotBlank(startPCode)) { LambdaQueryWrapper qw = new LambdaQueryWrapper(); + if("CHN".equals(startPCode)) { + startPCode = "1001"; + } qw.eq(LngBRegion::getCode,startPCode); LngBRegion tempPr = this.getOne(qw); - excludeTypeList.add(tempPr.getRegionTypeCode()); + if(tempPr != null) { + excludeTypeList.add(tempPr.getRegionTypeCode()); + } + } if(StringUtils.isNotBlank(excludeType)) { excludeTypeList.add(excludeType); @@ -122,7 +128,9 @@ public class CountryRegionServiceImpl extends ServiceImpl pList = this.list(Wrappers.query() .lambda().eq(LngBRegion::getCode, startPCode)); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplier.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplier.java index 880e6cc..f483091 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplier.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/entity/LngSupplier.java @@ -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 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 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 lngSupplierDocList; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierBankMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierBankMapper.java index 0cf4aa1..de4feb7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierBankMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierBankMapper.java @@ -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 { +public interface LngSupplierBankMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierContactMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierContactMapper.java index 932b95e..aaf99b6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierContactMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierContactMapper.java @@ -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 { +public interface LngSupplierContactMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierDocMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierDocMapper.java index e9cc148..7a13565 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierDocMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierDocMapper.java @@ -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 { +public interface LngSupplierDocMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierMapper.java index 7a61510..57e1f43 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngSupplierMapper extends MPJBaseMapper { +public interface LngSupplierMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreDtlMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreDtlMapper.java index 8d6907d..8e72e53 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreDtlMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreDtlMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @Version 1.0 */ @Mapper -public interface LngSupplierScoreDtlMapper extends MPJBaseMapper { +public interface LngSupplierScoreDtlMapper extends MPJBaseMapper,BaseMapper { } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java index a947888..9d63873 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/mapper/LngSupplierScoreMapper.java @@ -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 { +public interface LngSupplierScoreMapper extends MPJBaseMapper,BaseMapper { }