diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index cd9584f3d..7eb2225dc 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -16,6 +16,7 @@ import com.glxp.api.http.NmpaUdiClient; import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.req.basic.RemoveUdiRelRequest; +import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.CustomerService; @@ -290,18 +291,25 @@ public class UdiContrastController { public UdiRelevanceEntity setThird(UdiCombineRequest udiCombineRequest, UdiRelevanceEntity udiRelevanceEntity) { + FilterBasicThirdSysRequest request = new FilterBasicThirdSysRequest(); if ("thirdId".equals(udiCombineRequest.getThirdSys())) { udiRelevanceEntity.setThirdId(udiCombineRequest.getThirdId()); + request.setThirdId("thirdId"); } else if ("thirdId1".equals(udiCombineRequest.getThirdSys())) { udiRelevanceEntity.setThirdId1(udiCombineRequest.getThirdId()); + request.setThirdId("thirdId1"); } else if ("thirdId2".equals(udiCombineRequest.getThirdSys())) { udiRelevanceEntity.setThirdId2(udiCombineRequest.getThirdId()); + request.setThirdId("thirdId2"); } else if ("thirdId3".equals(udiCombineRequest.getThirdSys())) { udiRelevanceEntity.setThirdId3(udiCombineRequest.getThirdId()); + request.setThirdId("thirdId3"); } else if ("thirdId4".equals(udiCombineRequest.getThirdSys())) { udiRelevanceEntity.setThirdId4(udiCombineRequest.getThirdId()); + request.setThirdId("thirdId4"); } - ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys(); + + ThrSystemEntity thrSystemEntity = thrSystemService.selectMainThrSys1(request); String mainSys = thrSystemEntity.getThirdId(); if (mainSys.equals("thirdId")) { udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId()); diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrSystemDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrSystemDao.java index c7a9c412e..d10d70fe0 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrSystemDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrSystemDao.java @@ -14,6 +14,7 @@ public interface ThrSystemDao { ThrSystemEntity selectByThirdId(@Param("thirdId") String thirdId); + List filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest); /** diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index e7c9c344a..b7a40572a 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -34,5 +34,4 @@ public class UdiRelevanceEntity { private String createUser; private String updateUser; private String remark; - } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 028103825..9bf70b0f3 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -9,6 +9,7 @@ import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.thrsys.ThrSystemService; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java index e6e3a3d6a..577ec52fc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java @@ -18,6 +18,8 @@ public interface ThrSystemService { ThrSystemEntity selectMainThrSys(); + ThrSystemEntity selectMainThrSys1(FilterBasicThirdSysRequest filterBasicThirdSysRequest); + /** * 校验第三方系统名称是否重复 * diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java index 099e6cfc7..f4b5091bd 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java @@ -76,6 +76,13 @@ public class ThrSystemServiceImpl implements ThrSystemService { return null; } + @Override + public ThrSystemEntity selectMainThrSys1(FilterBasicThirdSysRequest filterBasicThirdSysRequest) { + ThrSystemEntity data = thrSystemDao.selectByThirdId(filterBasicThirdSysRequest.getThirdId()); + return data; + + } + @Override public boolean selectThirdNameExists(String thirdId, String thirdName) { ThrSystemEntity thrSystemEntity = thrSystemDao.selectByThirdIdAndThirdName(thirdId, thirdName); diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml index e1e43f29d..b00e05fc0 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrSystemDao.xml @@ -43,7 +43,6 @@ FROM thr_system WHERE thirdId = #{thirdId} -