根据注册证件备案号判断资质证书

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -169,14 +169,15 @@ public class IoOrderDetailBizController extends BaseController {
             BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
             if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
                 SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
-
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
-                    List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());
+//                    List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());
+                    addBizProductReqeust.setProductId(supProductEntity.getProductId());
+                    List<SupCertEntity> supCertEntities = supCertService.findByzczbhhzbapzbh(addBizProductReqeust);
                     if (CollUtil.isNotEmpty(supCertEntities)) {
                         Date curDate = new Date();
                         for (SupCertEntity supCertEntity : supCertEntities) {
                             if (supCertEntity.getExpireDate() != null && supCertEntity.getExpireDate().compareTo(curDate) < 0) {
-                                return ResultVOUtils.error(500, "产品资质证书已过期！");
+                                return ResultVOUtils.error(500, "该注册备案号所属产品资质证书已过期！");
                             }
                         }
                     }

src/main/java/com/glxp/api/dao/purchase/SupCertDao.java

@@ -4,6 +4,7 @@ package com.glxp.api.dao.purchase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.purchase.SupCertEntity;
+import com.glxp.api.req.inout.AddBizProductReqeust;
 import com.glxp.api.req.purchase.FilterSupCertRequest;
 import com.glxp.api.req.purchase.purPlanPrintRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,6 +24,8 @@ public interface SupCertDao extends BaseMapperPlus<SupCertDao, SupCertEntity, Su
 
     List<SupCertEntity> selectCompanyCert(FilterSupCertRequest filterSupCertRequest);
 
+    List<SupCertEntity> findByzczbhhzbapzbh(AddBizProductReqeust addBizProductReqeust);
+
     boolean updateCompanyCert(SupCertEntity supCertEntity);
 
     boolean insertCompanyCert(SupCertEntity supCertEntity);

src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java

@@ -13,6 +13,7 @@ public class AddBizProductReqeust {
     //单选添加
     private Long relId;
     private String zczbhhzbapzbh;
+    private String productId;
     private String supId;
     private String batchNo;
     private String productDate;

src/main/java/com/glxp/api/service/purchase/SupCertService.java

@@ -3,6 +3,7 @@ package com.glxp.api.service.purchase;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.glxp.api.entity.purchase.SupCertEntity;
+import com.glxp.api.req.inout.AddBizProductReqeust;
 import com.glxp.api.req.purchase.FilterSupCertRequest;
 import com.glxp.api.req.purchase.purPlanPrintRequest;
 
@@ -22,6 +23,8 @@ public interface SupCertService extends IService<SupCertEntity> {
 
     List<SupCertEntity> findByProductId(String productId);
 
+    List<SupCertEntity> findByzczbhhzbapzbh(AddBizProductReqeust addBizProductReqeust);
+
     List<SupCertEntity> selectCompanyCert(FilterSupCertRequest filterSupCertRequest);
 
 

src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.purchase.SupCertDao;
 import com.glxp.api.entity.purchase.SupCertEntity;
+import com.glxp.api.req.inout.AddBizProductReqeust;
 import com.glxp.api.req.purchase.FilterSupCertRequest;
 import com.glxp.api.req.purchase.purPlanPrintRequest;
 import com.glxp.api.service.purchase.SupCertService;
@@ -111,6 +112,10 @@ public class SupCertServiceImpl extends ServiceImpl<SupCertDao, SupCertEntity> i
         return supCertDao.selectList(new QueryWrapper<SupCertEntity>().eq("productIdFk", productId));
     }
 
+    @Override
+    public List<SupCertEntity> findByzczbhhzbapzbh(AddBizProductReqeust addBizProductReqeust) {
+        return supCertDao.findByzczbhhzbapzbh(addBizProductReqeust);
+    }
 
     @Override
     public boolean updateCompanyCert(SupCertEntity supCertEntity) {

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1255,7 +1255,9 @@
                 ON basic_products.uuid = basic_udirel.uuid
                      left join company_product_relevance
                 on basic_udirel.id = company_product_relevance.udiRlIdFk
-                     left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
+                     left JOIN basic_corp
+                on basic_corp.erpId = company_product_relevance.customerId
+
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')

src/main/resources/mybatis/mapper/purchase/SupCertDao.xml

@@ -50,6 +50,25 @@
 
     </select>
 
+    <select id="findByzczbhhzbapzbh" parameterType="com.glxp.api.req.inout.AddBizProductReqeust"
+            resultType="com.glxp.api.entity.purchase.SupCertEntity">
+        SELECT sc.*
+        FROM sup_cert sc
+        LEFT JOIN sup_product sp ON sc.productIdFk = sp.productId
+        <where>
+            <if test="relId != null and relId != ''">
+                and sp.relIdFk = #{relId}
+            </if>
+            <if test="productId != null and productId != ''">
+                and sp.productId = #{productId}
+            </if>
+            <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
+                AND sp.recordCode like concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+        </where>
+
+    </select>
+
 
     <select id="findCompanyCertByName" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.purchase.SupCertEntity">