From 5c2ee6d58b01979193233522d523cdad1dacba99 Mon Sep 17 00:00:00 2001 From: yewj Date: Fri, 6 Dec 2024 16:54:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 8 +++--- .../com/glxp/api/http/ErpBasicClient.java | 10 +++---- .../basic/CompanyProductRelevanceService.java | 2 ++ .../CompanyProductRelevanceServiceImpl.java | 23 ++++++++++++++++ .../collect/IoCollectOrderBackupService.java | 26 ++++++++++++++++--- 5 files changed, 56 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index ece144c28..9758cbc08 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -423,9 +423,9 @@ public class UdiRelevanceController extends BaseController { try { ThreadUtil.execAsync(() -> { CodeRel codeRel = new CodeRel(); - if(udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1){ + if (udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1) { codeRel.setDiNameCode(udiRelevanceSaveRequest.getNameCode()); - }else { + } else { codeRel.setDrugCode(udiRelevanceSaveRequest.getNameCode()); } codeRel.setYbbm(udiRelevanceSaveRequest.getYbbm()); @@ -434,8 +434,8 @@ public class UdiRelevanceController extends BaseController { codeRel.setUpdateTime(new Date()); spsDirectClient.updateCodeRelDetail(codeRel); }); - }catch (Exception e){ - System.out.println("上传多码融合:"+e); + } catch (Exception e) { + System.out.println("上传多码融合:" + e); } return ResultVOUtils.success("更新成功"); diff --git a/src/main/java/com/glxp/api/http/ErpBasicClient.java b/src/main/java/com/glxp/api/http/ErpBasicClient.java index 3da7a027f..f44eff817 100644 --- a/src/main/java/com/glxp/api/http/ErpBasicClient.java +++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java @@ -286,7 +286,7 @@ public class ErpBasicClient { return listBaseResponse; } catch (Exception e) { log.error("获取医保单据信息", e); - return ResultVOUtils.error(500, "连接第三方系统接口服务出错"+e.getMessage()); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage()); } } @@ -503,7 +503,7 @@ public class ErpBasicClient { } } - public BaseResponse> getBuyType(String thirdSys) { + public BaseResponse> getBuyType(String thirdSys) { ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys); String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getBuyType"; try { @@ -511,14 +511,14 @@ public class ErpBasicClient { if (StrUtil.isEmpty(response)) { return ResultVOUtils.error(500, "连接第三方系统接口服务出错"); } - BaseResponse> listBaseResponse = - JSONObject.parseObject(response, new TypeReference>>() { + BaseResponse> listBaseResponse = + JSONObject.parseObject(response, new TypeReference>>() { }); return listBaseResponse; } catch (Exception e) { log.error("获取交易类型集合", e); - return ResultVOUtils.error(500, "连接第三方系统接口服务出错"+e.getMessage()); + return ResultVOUtils.error(500, "连接第三方系统接口服务出错" + e.getMessage()); } } } diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java index ce04e3631..68c80b9c9 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductRelevanceService.java @@ -19,4 +19,6 @@ public interface CompanyProductRelevanceService extends IService().eq("udiRlIdFk", relId)); } + + @Override + public String insertOrReadId(Long udiRlIdFk, String unitId) { + + CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceDao.selectOne(new LambdaQueryWrapper() + .eq(CompanyProductRelevanceEntity::getUdiRlIdFk, udiRlIdFk) + .eq(CompanyProductRelevanceEntity::getUnitFk, unitId).last("limit 1")); + if (companyProductRelevanceEntity != null) { + return companyProductRelevanceEntity.getCustomerId(); + } else { + companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); + companyProductRelevanceEntity.setId(IdUtil.getSnowflakeNextId()); + companyProductRelevanceEntity.setCustomerId(unitId); + companyProductRelevanceEntity.setUnitFk(unitId); + companyProductRelevanceEntity.setUdiRlIdFk(udiRlIdFk); + companyProductRelevanceEntity.setUpdateTime(new Date()); + companyProductRelevanceEntity.setCreateTime(new Date()); + companyProductRelevanceDao.insertCompanyProductRelevance(companyProductRelevanceEntity); + } + return null; + } } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index 221a1f6c3..9ce87f83b 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -19,6 +19,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.collect.*; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; @@ -32,6 +33,7 @@ import com.glxp.api.req.inout.ReviewFinishRequest; import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; +import com.glxp.api.service.basic.CompanyProductRelevanceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.basic.UdiRlSupService; @@ -47,10 +49,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; @Service public class IoCollectOrderBackupService extends ServiceImpl { @@ -161,6 +161,9 @@ public class IoCollectOrderBackupService extends ServiceImpl> groupedMap = lossCodesList.stream() + .collect(Collectors.groupingBy(IoCodeTempEntity::getRelId)); + groupedMap.forEach((key, value) -> { + companyProductRelevanceService.insertOrReadId(key, collectOrder.getFromCorp()); + }); + for (IoCodeTempEntity codeTempEntity : lossCodesList) { + codeTempEntity.setSupId(collectOrder.getFromCorp()); + } + } orderService.insertOrder(orderEntity); codesTempDao.insertBatch(lossCodesList); addInoutService.dealProcess(orderEntity);