From 7cfe54fa391090620d0d86db89011bbd401c417e Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 28 Aug 2024 17:02:31 +0800 Subject: [PATCH] =?UTF-8?q?8/28=20=E8=8D=AF=E5=93=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=AC=AC=E4=B8=89=E6=96=B9=E8=8D=AF=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/thrsys/ThrProductsController.java | 3 +++ .../com/glxp/api/entity/thrsys/ThrProductsEntity.java | 8 ++++++++ .../com/glxp/api/req/thrsys/FilterThrProductsRequest.java | 5 +++++ .../com/glxp/api/service/basic/UdiContrastService.java | 8 ++++++++ src/main/java/com/glxp/api/service/sync/HeartService.java | 2 +- .../resources/mybatis/mapper/thrsys/ThrProductsDao.xml | 7 +++++-- src/main/resources/schemas/schema_v2.4.sql | 6 ++++++ 7 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index bc152b4e6..d2c2f9a14 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -81,6 +81,9 @@ public class ThrProductsController { BaseResponse> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterThrProductsRequest); return udiDlDeviceResponse; } else { + if (filterThrProductsRequest.getProductType() == null){ + filterThrProductsRequest.setProductType(1); + } List thrCorpEntities = thrProductsService.filterJoinThrProducts(filterThrProductsRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(thrCorpEntities); diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java index 21c7e382d..90ef4f0d5 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java @@ -238,4 +238,12 @@ public class ThrProductsEntity { @TableField(value = "matrial") @ApiModelProperty(value="耗材材质") private String matrial; + + + /** + * 产品类别 1:器械 2:药品 + */ + @TableField(value = "productType") + private Integer productType; + } diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java index 335fe3cd8..afdf77145 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java @@ -37,6 +37,11 @@ public class FilterThrProductsRequest extends ListPageRequest { private Integer type; private Boolean isStack; + /** + * 产品类型 1:器械 2:药品 + */ + private Integer productType; + public List getThrProductsEntities() { return thrProductsEntities; } diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 91c1fff61..2b9fb04bb 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -215,6 +215,14 @@ public class UdiContrastService { udiProductEntity.setScbssfbhscrq("是"); udiProductEntity.setScbssfbhsxrq("是"); udiProductEntity.setScbssfbhxlh("否"); + + udiProductEntity.setProductsType(thrProductsEntity.getProductType()); + if (thrProductsEntity.getProductType() == 2){ + udiProductEntity.setRequireScanCode(1); + udiProductEntity.setMajorStatus(1); + }else { + udiProductEntity.setRequireScanCode(0); + } if (StrUtil.isEmpty(udiProductEntity.getPrice())) { udiProductEntity.setPrice(null); } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 0d0bcfcfa..5b29286ab 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1178,7 +1178,7 @@ public class HeartService { @Transactional(rollbackFor = Exception.class) public void uploadData(BasicExportTypeEnum exportType, String taskId, Function dataMethod) { - Date startTime = new Date(); + Date startTime = new Date(); Integer status = StatusEnum.SUCCESS.getCode(); Object data = dataMethod.apply(this); if (data == null) { diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index e60bb0e32..2f573e297 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -139,6 +139,9 @@ AND thirdSysFk = #{thirdSys} + + AND productType = #{productType} + AND supName LIKE concat('%', #{supName}, '%') @@ -171,7 +174,7 @@ (id, code, `name`, measname, spec, registerNo, manufactory, cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, - price, createUser, createTime, updateUser, manufactoryCode, supCode, type, prcitmcode,invCode) + price, createUser, createTime, updateUser, manufactoryCode, supCode, type, prcitmcode,invCode,productType) values (#{id}, #{code}, #{name}, @@ -203,7 +206,7 @@ #{price}, #{createUser}, #{createTime}, - #{updateUser}, #{manufactoryCode}, #{supCode}, #{type}, #{prcitmcode},#{invCode}) + #{updateUser}, #{manufactoryCode}, #{supCode}, #{type}, #{prcitmcode},#{invCode},#{productType})