资质产品选入修改

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

@@ -159,7 +159,7 @@ public class IoOrderDetailBizController extends BaseController {
 //            todo 查询产品是否已经通过认证
 
             if (isVailCert && udiRelevanceResponse.isNeedCert()) {
-                SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
+                SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(),"");
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
 
                 } else {

src/main/java/com/glxp/api/controller/purchase/SupProductController.java

@@ -154,27 +154,38 @@ public class SupProductController {
     public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) {
 
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk()));
-        SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
+        SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(),selectProductBindRequest.getManufacturerId());
         if (supProductEntity != null) {
-            return ResultVOUtils.error(500, "资质证书已存在，请勿重复添加！");
+            return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！");
+        }else{
+            supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(),"");
+            if(supProductEntity!=null){
+                supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
+                supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
+                supProductEntity.setCreateTime(new Date());
+                supProductEntity.setUpdateTime(new Date());
+            }else{
+                supProductEntity = new SupProductEntity();
+                BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
+                supProductEntity.setProductId(selectProductBindRequest.getProductId());
+                supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
+                supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + "");
+                supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc());
+                supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
+                supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
+                supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
+                supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
+                supProductEntity.setCreateTime(new Date());
+                supProductEntity.setUpdateTime(new Date());
+                supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
+                supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
+                supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
+                supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName());
+                supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
+            }
+
         }
-        supProductEntity = new SupProductEntity();
+
-        BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
-        supProductEntity.setProductId(selectProductBindRequest.getProductId());
-        supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
-        supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + "");
-        supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc());
-        supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
-        supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
-        supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
-        supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
-        supProductEntity.setCreateTime(new Date());
-        supProductEntity.setUpdateTime(new Date());
-        supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
-        supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
-        supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
-        supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName());
-        supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
 
         return ResultVOUtils.success(supProductEntity);
 //        boolean b = supProductService.insertRegistration(supProductEntity);

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

@@ -17,7 +17,7 @@ public interface SupProductService {
     SupProductEntity findByRelIdFk(String relIdFk);
 
 
-    SupProductEntity findByManufactury(String cpmctymc, String manufactory);
+    SupProductEntity findByManufactury(String cpmctymc, String manufactory,String manufacturerIdFk);
 
     SupProductResponse findByPassByReCert(String registerCert);
 

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

@@ -82,10 +82,20 @@ public class SupProductServiceImpl implements SupProductService {
     }
 
     @Override
-    public SupProductEntity findByManufactury(String cpmctymc, String manufactory) {
+    public SupProductEntity findByManufactury(String cpmctymc, String manufactory,String manufacturerIdFk) {
-        List<SupProductEntity> supProductEntities = supProductDao.selectList(new QueryWrapper<SupProductEntity>().eq("manufactory", manufactory)
+
-                .eq("recordProductName", cpmctymc)
+        QueryWrapper<SupProductEntity> ew=new QueryWrapper<>();
-                .last("LIMIT 1"));
+        if(StrUtil.isNotEmpty(manufactory)){
+            ew.eq("manufactory",manufactory);
+        }
+        if(StrUtil.isNotEmpty(cpmctymc)){
+            ew.eq("recordProductName",cpmctymc);
+        }
+        if(StrUtil.isNotEmpty(manufacturerIdFk)){
+            ew.eq("manufacturerIdFk",manufacturerIdFk);
+        }
+        ew.last("limit 1");
+        List<SupProductEntity> supProductEntities = supProductDao.selectList(ew);
         if (CollUtil.isNotEmpty(supProductEntities))
             return supProductEntities.get(0);
         else return null;