diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBDocCpDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBDocCpDto.java index 5e3c133..0eeec16 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBDocCpDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBDocCpDto.java @@ -100,4 +100,5 @@ public class UpdateLngBDocCpDto implements Serializable { private Long tenantId; + private String docTypeCode; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java index 006be09..19d7170 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerDocVo.java @@ -39,6 +39,12 @@ public class LngCustomerDocVo { @ApiModelProperty("资质证书类型") private String docTypeCode; + /** + * 资质证书类型 + */ + @ApiModelProperty("资质证书类型名称") + private String docTypeName; + /** * 资质证书编号 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierDocVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierDocVo.java index a41095e..4fe3fc6 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierDocVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/supplier/vo/LngSupplierDocVo.java @@ -39,6 +39,12 @@ public class LngSupplierDocVo { @ApiModelProperty("资质证书类型") private String docTypeCode; + /** + * 资质证书类型 + */ + @ApiModelProperty("资质证书名称") + private String docTypeName; + /** * 资质证书编号 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 e918cad..bce6d59 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 @@ -24,12 +24,11 @@ import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBDocCpPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBDocCpDto; +import com.xjrsoft.module.mdm.entity.LngBCurrency; import com.xjrsoft.module.mdm.entity.LngBDocCp; -import com.xjrsoft.module.mdm.entity.LngBRegion; import com.xjrsoft.module.mdm.service.IDocCpService; import com.xjrsoft.module.mdm.vo.LngBDocCpPageVo; import com.xjrsoft.module.mdm.vo.LngBDocCpVo; -import com.xjrsoft.module.mdm.vo.LngBRegionVo; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; @@ -132,11 +131,25 @@ public class DocCpController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); 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); + .like(StrUtil.isNotBlank(dto.getFullName()), LngBDocCp::getFullName, dto.getFullName()); + if (StrUtil.isNotBlank(dto.getDocTypeCode())) { + queryWrapper.and(wrapper -> { + // 构建 (valid AND suSign) 的交集 + wrapper.eq(StrUtil.isNotBlank(dto.getValid()),LngBDocCp::getValid, dto.getValid()) + .eq(StrUtil.isNotBlank(dto.getCuSign()),LngBDocCp::getCuSign, dto.getCuSign()) + .eq(StrUtil.isNotBlank(dto.getSuSign()),LngBDocCp::getSuSign, dto.getSuSign()) + .or(w -> w.eq(LngBDocCp::getCode, dto.getDocTypeCode())); + }); + + }else { + queryWrapper.eq(StrUtil.isNotBlank(dto.getValid()),LngBDocCp::getValid, dto.getValid()) + .eq(StrUtil.isNotBlank(dto.getCuSign()),LngBDocCp::getCuSign, dto.getCuSign()) + .eq(StrUtil.isNotBlank(dto.getSuSign()),LngBDocCp::getSuSign, dto.getSuSign()); + + } + + queryWrapper.orderByDesc(LngBDocCp::getCode); + List voList = CollectionUtils.newArrayList(); List docList = docCpService.list(queryWrapper); if(docList != null && docList.size() > 0) { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java index bc462f0..f72b00b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/mapper/LngCustomerDocMapper.java @@ -2,8 +2,15 @@ package com.xjrsoft.module.sales.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.dayPlan.vo.LngPngSettlePurVo; import com.xjrsoft.module.sales.entity.LngCustomerDoc; +import com.xjrsoft.module.sales.vo.LngCustomerDocVo; + +import java.util.List; + import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -14,4 +21,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngCustomerDocMapper extends MPJBaseMapper,BaseMapper { + @Select("SELECT a.*, cu.cu_sname,doc.full_name as doc_type_name" + + " FROM lng_customer_doc a" + + " LEFT JOIN lng_customer cu ON cu.cu_code=a.cu_code" + + " LEFT JOIN lng_b_doc_cp doc ON doc.code=a.doc_type_code"+ + " WHERE a.cu_code = #{cuCode} order by a.sort") + List queryLngCustomerDocList(@Param("cuCode")String cuCode); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java index 93112cc..fcd4bc2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -86,6 +86,8 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl docList = lngCustomerDocMapper.queryLngCustomerDocList(vo.getCuCode()); + vo.setLngCustomerDocList(docList); if(CollectionUtil.isNotEmpty(vo.getLngCustomerDocList())) { for(LngCustomerDocVo lngCustomerDoc: vo.getLngCustomerDocList()) { List fileList = fileClient.getTableFiles("lng_customer_doc", "fileList", lngCustomerDoc.getId()); 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 7a13565..5472cba 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,9 +2,16 @@ package com.xjrsoft.module.supplier.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; +import com.xjrsoft.module.sales.vo.LngCustomerDocVo; import com.xjrsoft.module.supplier.entity.LngSupplierContact; import com.xjrsoft.module.supplier.entity.LngSupplierDoc; +import com.xjrsoft.module.supplier.vo.LngSupplierDocVo; + +import java.util.List; + import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -15,4 +22,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngSupplierDocMapper extends MPJBaseMapper,BaseMapper { + @Select("SELECT a.*, su.su_sname,doc.full_name as doc_type_name" + + " FROM lng_supplier_doc a" + + " LEFT JOIN lng_supplier su ON su.su_code=a.su_code" + + " LEFT JOIN lng_b_doc_cp doc ON doc.code=a.doc_type_code"+ + " WHERE a.su_code = #{suCode} order by a.sort") + List queryLngSupplierDocList(@Param("suCode")String suCode); } 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 b3a1fcd..6cf34ab 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 @@ -29,7 +29,7 @@ public interface ISupplierService extends MPJBaseService, MPJDeepSe * @param ids * @return */ - Boolean delete(List ids); + //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 40f7eaf..12a4890 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 @@ -47,8 +47,11 @@ public class SupplierScoreServiceImpl extends MPJBaseServiceImpl() - .eq(LngSupplier::getSuCode, vo.getCpCode())); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(LngSupplier::getSuCode,lngScore.getCpCode()); + LngSupplier supplier = supplierMapper.selectOne(queryWrapper); + if(supplier != null) { vo.setCpClassCode(supplier.getClassCode()); vo.setCpName(supplier.getSuName()); 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 13a85c1..9fdb6e4 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 @@ -15,6 +15,7 @@ import com.github.yulichang.base.MPJBaseServiceImpl; import com.pictc.enums.ApproveCodeEnum; import com.xjrsoft.module.mdm.client.ILngBankClient; import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; +import com.xjrsoft.module.sales.vo.LngCustomerDocVo; import com.xjrsoft.module.supplier.entity.LngSupplier; import com.xjrsoft.module.supplier.entity.LngSupplierBank; import com.xjrsoft.module.supplier.entity.LngSupplierContact; @@ -46,25 +47,14 @@ import lombok.AllArgsConstructor; public class SupplierServiceImpl extends MPJBaseServiceImpl implements ISupplierService { private final LngSupplierMapper supplierMapper; - private final LngSupplierBankMapper supplierLngSupplierBankMapper; - private final LngSupplierContactMapper supplierLngSupplierContactMapper; - private final LngSupplierDocMapper supplierLngSupplierDocMapper; + private final LngSupplierBankMapper lngSupplierBankMapper; + private final LngSupplierContactMapper lngSupplierContactMapper; + private final LngSupplierDocMapper lngSupplierDocMapper; private final IFileClient fileClient; private final ILngBankClient bankClient; - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean delete(List 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)); - - return true; - } - @Override public LngSupplierVo getSupplierById(Long id) { LngSupplier lngSupplier = this.getByIdDeep(id); @@ -86,6 +76,8 @@ public class SupplierServiceImpl extends MPJBaseServiceImpl docList = lngSupplierDocMapper.queryLngSupplierDocList(vo.getSuCode()); + vo.setLngSupplierDocList(docList); if(CollectionUtil.isNotEmpty(vo.getLngSupplierDocList())) { for(LngSupplierDocVo lngSupplierDoc: vo.getLngSupplierDocList()) { List fileList = fileClient.getTableFiles("lng_Supplier_doc", "fileList", lngSupplierDoc.getId());