修改bug

master
wangwei 2 years ago
parent 7adf992a61
commit 2db5497a93

@ -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());

@ -14,6 +14,7 @@ public interface ThrSystemDao {
ThrSystemEntity selectByThirdId(@Param("thirdId") String thirdId);
List<ThrSystemEntity> filterBasicThiSys(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
/**

@ -34,5 +34,4 @@ public class UdiRelevanceEntity {
private String createUser;
private String updateUser;
private String remark;
}

@ -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;

@ -18,6 +18,8 @@ public interface ThrSystemService {
ThrSystemEntity selectMainThrSys();
ThrSystemEntity selectMainThrSys1(FilterBasicThirdSysRequest filterBasicThirdSysRequest);
/**
*
*

@ -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);

@ -43,7 +43,6 @@
FROM thr_system
WHERE thirdId = #{thirdId}
</select>
<select id="selectEnabledThirdId" resultType="java.lang.String">
select thirdId
from thr_system

Loading…
Cancel
Save