From 72cf0afadbf289dc92790fdfb2c54e9444e830a9 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Wed, 27 Nov 2024 09:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A6=87=E5=B9=BC=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=20=E7=AC=AC=E4=B8=89=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/client/hlfyyy/HlfyyyClient.java | 169 ++++++++++++------ .../com/glxp/mipsdl/entity/hlfyyy/VA002.java | 46 ++--- .../req/base/UdiwmsWarehouseRequest.java | 1 + .../mipsdl/res/PageSimpleResponseNew.java | 29 +++ .../mipsdl/service/hlfyyy/VA001Service.java | 12 +- .../mipsdl/service/hlfyyy/VA004Service.java | 22 ++- .../mipsdl/thirddao/hlfyyy/VA001Mapper.java | 4 +- .../mipsdl/thirddao/hlfyyy/VA004Mapper.java | 6 + .../mapper/master/hlfyyy/VA001Mapper.xml | 53 ++---- .../mapper/master/hlfyyy/VA004Mapper.xml | 17 ++ 10 files changed, 236 insertions(+), 123 deletions(-) create mode 100644 src/main/java/com/glxp/mipsdl/res/PageSimpleResponseNew.java diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java index 825ba77..821a40b 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -53,6 +53,7 @@ import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest; import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest; import com.glxp.mipsdl.res.BaseResponse; import com.glxp.mipsdl.res.PageSimpleResponse; +import com.glxp.mipsdl.res.PageSimpleResponseNew; import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.service.auth.AuthWarehouseService; @@ -74,6 +75,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -151,6 +155,8 @@ public class HlfyyyClient extends CommonHttpClient { private RelCodeDetailService relCodeDetailService; + + @Resource private VA001Service va001Service; @@ -174,6 +180,8 @@ public class HlfyyyClient extends CommonHttpClient { private VA006Service va006Service; @Resource private VA015Service va015Service; + @Resource + private VA002Mapper va002Mapper; @Resource private VA003Mapper va003Mapper; @@ -259,54 +267,75 @@ public class HlfyyyClient extends CommonHttpClient { @Override public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) { if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DEVICE)) { - CtqyyRequest ctqyyRequest = new CtqyyRequest(); - ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); - ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PI_QUERY_URL), ctqyyRequest); - response = parserResult(response); - try { - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - Map map = (Map) baseResponse.getData(); - List zzzyyProductsResponse = JSON.parseArray(map.get("list") + "", ZzzyyProductsResponse.class); - for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) { - //判断要是规格和型号一致就是取规格 不一致就合并 - if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) { - if (productsResponse.getModel_number().equals(productsResponse.getStandard())) { - productsResponse.setStandard(productsResponse.getStandard()); - } else { - productsResponse.setStandard(productsResponse.getStandard() + productsResponse.getModel_number()); - } - } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) { - productsResponse.setStandard(productsResponse.getModel_number()); + + List list = udiwmsProductRequest.getThrProductsEntities(); + List codeList = new ArrayList(); + List nameList = new ArrayList(); + List registerNoList = new ArrayList(); + + if(list!=null && list.size() >0 ){ + for (ThrProductsEntity thrProductsEntity : list) { + if(StringUtils.isNotEmpty(thrProductsEntity.getCode())){ + codeList.add(thrProductsEntity.getCode()); + + } + if(StringUtils.isNotEmpty(thrProductsEntity.getName())){ + nameList.add(thrProductsEntity.getName()); + } - productsResponse.setProductType(1); + if(StringUtils.isNotEmpty(thrProductsEntity.getRegisterNo())){ + registerNoList.add(thrProductsEntity.getRegisterNo()); + + } + } - map.put("list", JSON.toJSON(zzzyyProductsResponse)); - baseResponse.setData(""); - baseResponse.setData(map); - return baseResponse; - } catch (Exception e) { - log.error("解析湖里妇幼医院智业接口返回产品信息字典数据异常，返回结果：{}", response); - log.error("异常信息：{}", e); - return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + //补充其他查询条件 + wrapper.in(codeList!=null && codeList.size()>0, VA002::getCode,codeList); + wrapper.in(nameList!=null && nameList.size()>0, VA002::getName, nameList); + wrapper.in(registerNoList!=null && registerNoList.size()>0, VA002::getRegisterno, registerNoList); + // 保留之前的查询方法怕有用到 + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VA002::getCode, udiwmsProductRequest.getCode()); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VA002::getName, udiwmsProductRequest.getName()); + wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VA002::getRegisterno, udiwmsProductRequest.getRegisterNo()); + + wrapper.eq(VA002::getRemark,"Y"); + IPage page = va002Mapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); + List physicDictEntities = page.getRecords(); + List zzzyyProductsResponseList = null; + if (CollUtil.isNotEmpty(physicDictEntities)) { + //数据处理以thr_products 返回 + zzzyyProductsResponseList = physicDictEntities.stream().map(dict -> { + ZzzyyProductsResponse products = new ZzzyyProductsResponse(); +// BeanUtil.copyProperties(dict,products); + oracleCompatibleCopy(dict,products); + products.setProductType(1); +// products.setRegisterNo(dict.getRegisterno()); + return products; + }).collect(Collectors.toList()); + } + PageSimpleResponse zzzyyProductsResponse = new PageSimpleResponse<>(); + zzzyyProductsResponse.setTotal(page.getTotal()); + zzzyyProductsResponse.setList(zzzyyProductsResponseList); + return ResultVOUtils.success(zzzyyProductsResponse); } else if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)) { List list = udiwmsProductRequest.getThrProductsEntities(); List codeList = new ArrayList(); List nameList = new ArrayList(); List registerNoList = new ArrayList(); - if (list != null && list.size() > 0) { + if(list!=null && list.size() >0 ){ for (ThrProductsEntity thrProductsEntity : list) { - if (StringUtils.isNotEmpty(thrProductsEntity.getCode())) { + if(StringUtils.isNotEmpty(thrProductsEntity.getCode())){ codeList.add(thrProductsEntity.getCode()); } - if (StringUtils.isNotEmpty(thrProductsEntity.getName())) { + if(StringUtils.isNotEmpty(thrProductsEntity.getName())){ nameList.add(thrProductsEntity.getName()); } - if (StringUtils.isNotEmpty(thrProductsEntity.getRegisterNo())) { + if(StringUtils.isNotEmpty(thrProductsEntity.getRegisterNo())){ registerNoList.add(thrProductsEntity.getRegisterNo()); } @@ -315,15 +344,15 @@ public class HlfyyyClient extends CommonHttpClient { } LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); //补充其他查询条件 - wrapper.in(codeList != null && codeList.size() > 0, VA003::getCode, codeList); - wrapper.in(nameList != null && nameList.size() > 0, VA003::getName, nameList); - wrapper.in(registerNoList != null && registerNoList.size() > 0, VA003::getRegisterno, registerNoList); + wrapper.in(codeList!=null && codeList.size()>0, VA003::getCode,codeList); + wrapper.in(nameList!=null && nameList.size()>0, VA003::getName, nameList); + wrapper.in(registerNoList!=null && registerNoList.size()>0, VA003::getRegisterno, registerNoList); // 保留之前的查询方法怕有用到 wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VA003::getCode, udiwmsProductRequest.getCode()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), VA003::getName, udiwmsProductRequest.getName()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), VA003::getRegisterno, udiwmsProductRequest.getRegisterNo()); - wrapper.eq(VA003::getRemark, "Y"); + wrapper.eq(VA003::getRemark,"Y"); IPage page = va003Mapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); List physicDictEntities = page.getRecords(); List thrProductsEntityList = null; @@ -331,9 +360,10 @@ public class HlfyyyClient extends CommonHttpClient { //数据处理以thr_products 返回 thrProductsEntityList = physicDictEntities.stream().map(dict -> { ThrProductsEntity products = new ThrProductsEntity(); - BeanUtil.copyProperties(dict, products); + oracleCompatibleCopy(dict,products); products.setSpec(dict.getBzgg()); products.setProductType(2); + products.setRegisterNo(dict.getRegisterno()); return products; }).collect(Collectors.toList()); } @@ -724,7 +754,7 @@ public class HlfyyyClient extends CommonHttpClient { .selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo()) .eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk()) .eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()). - groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); + groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); if (CollectionUtil.isNotEmpty(invoiceList)) { fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(",")); if (invoiceList.get(0).getInvoiceDate() != null) @@ -1021,8 +1051,7 @@ public class HlfyyyClient extends CommonHttpClient { ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(ptxhyyInvRequest)); String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest); -// String response = -// "{\"code\": 20000,\"message\": \"success\",\"data\": {\"list\": [{\"seqNo\": \"97425947\",\"visitNo\": \"1471827014\",\"sickName\": \"杨玉聪\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 00:53:56\"},{\"seqNo\": \"97425950\",\"visitNo\": \"1471827014\",\"sickName\": \"杨玉聪\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 00:53:56\"},{\"seqNo\": \"97426036\",\"visitNo\": \"1940696001\",\"sickName\": \"郑良屹\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950057000000\",\"itemName\": \"热敏胶片 8in*10in/HQ-KX411 A型\",\"Price\": 7.8,\"quantity\": 4,\"Cost\": 31.2,\"materialCode\": \"00087\",\"materialName\": \"热敏胶片\",\"OperTime\": \"2024-02-21 01:39:39\"},{\"seqNo\": \"97426048\",\"visitNo\": \"1746585006\",\"sickName\": \"张杨妍\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000005\",\"itemName\": \"一次性注射器2ml(/支)\",\"Price\": 0.21,\"quantity\": 1,\"Cost\": 0.21,\"materialCode\": \"77375\",\"materialName\": \"一次性注射器2ml\",\"OperTime\": \"2024-02-21 02:06:05\"},{\"seqNo\": \"97426113\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 04:49:46\"},{\"seqNo\": \"97426233\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 04:54:51\"},{\"seqNo\": \"97426247\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 04:54:55\"},{\"seqNo\": \"97426250\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950029000010\",\"itemName\": \"一次性使用输液器BI-IT带针0.7# /支)\",\"Price\": 0.81,\"quantity\": 1,\"Cost\": 0.81,\"materialCode\": \"02585\",\"materialName\": \"一次性使用输液器 带针\",\"OperTime\": \"2024-02-21 04:56:20\"},{\"seqNo\": \"97426251\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000006\",\"itemName\": \"一次性无菌注射器20ml(/支)\",\"Price\": 0.48,\"quantity\": 2,\"Cost\": 0.96,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 04:56:21\"},{\"seqNo\": \"97426252\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950031000025\",\"itemName\": \"一次性使用静脉留置针22GII型A（直型连接座式安全型）Y型2225601\",\"Price\": 4.82,\"quantity\": 1,\"Cost\": 4.82,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 04:56:21\"},{\"seqNo\": \"97426258\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000005\",\"itemName\": \"一次性注射器2ml(/支)\",\"Price\": 0.21,\"quantity\": 1,\"Cost\": 0.21,\"materialCode\": \"77375\",\"materialName\": \"一次性注射器2ml\",\"OperTime\": \"2024-02-21 04:56:24\"},{\"seqNo\": \"97426284\",\"visitNo\": \"1801137003\",\"sickName\": \"杨立群\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000005\",\"itemName\": \"一次性注射器2ml(/支)\",\"Price\": 0.21,\"quantity\": 1,\"Cost\": 0.21,\"materialCode\": \"77375\",\"materialName\": \"一次性注射器2ml\",\"OperTime\": \"2024-02-21 05:03:40\"},{\"seqNo\": \"97426357\",\"visitNo\": \"1940699001\",\"sickName\": \"严明祥\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950031000025\",\"itemName\": \"一次性使用静脉留置针22GII型A（直型连接座式安全型）Y型2225601\",\"Price\": 4.82,\"quantity\": 1,\"Cost\": 4.82,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 05:28:40\"},{\"seqNo\": \"97426358\",\"visitNo\": \"1940699001\",\"sickName\": \"严明祥\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000006\",\"itemName\": \"一次性无菌注射器20ml(/支)\",\"Price\": 0.48,\"quantity\": 2,\"Cost\": 0.96,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 05:28:40\"},{\"seqNo\": \"97426359\",\"visitNo\": \"1940699001\",\"sickName\": \"严明祥\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950029000010\",\"itemName\": \"一次性使用输液器BI-IT带针0.7# /支)\",\"Price\": 0.81,\"quantity\": 1,\"Cost\": 0.81,\"materialCode\": \"02585\",\"materialName\": \"一次性使用输液器 带针\",\"OperTime\": \"2024-02-21 05:28:40\"},{\"seqNo\": \"97426433\",\"visitNo\": \"1940702001\",\"sickName\": \"伍邦柏\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000005\",\"itemName\": \"一次性注射器2ml(/支)\",\"Price\": 0.21,\"quantity\": 1,\"Cost\": 0.21,\"materialCode\": \"77375\",\"materialName\": \"一次性注射器2ml\",\"OperTime\": \"2024-02-21 06:51:25\"},{\"seqNo\": \"97426478\",\"visitNo\": \"1927463002\",\"sickName\": \"林海龙\",\"applyDept\": \"187\",\"deptName\": \"门诊呼吸与危重症医学科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:42:23\"},{\"seqNo\": \"97426486\",\"visitNo\": \"1927463002\",\"sickName\": \"林海龙\",\"applyDept\": \"187\",\"deptName\": \"门诊呼吸与危重症医学科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:42:24\"},{\"seqNo\": \"97426518\",\"visitNo\": \"1940705001\",\"sickName\": \"姚连菊\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:48:31\"},{\"seqNo\": \"97426521\",\"visitNo\": \"1940705001\",\"sickName\": \"姚连菊\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:48:31\"},{\"seqNo\": \"97426523\",\"visitNo\": \"1940703001\",\"sickName\": \"薛连辉\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:49:10\"},{\"seqNo\": \"97426529\",\"visitNo\": \"1940703001\",\"sickName\": \"薛连辉\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:49:11\"},{\"seqNo\": \"97426535\",\"visitNo\": \"1940703001\",\"sickName\": \"薛连辉\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:49:13\"},{\"seqNo\": \"97426537\",\"visitNo\": \"1940703001\",\"sickName\": \"薛连辉\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:49:15\"},{\"seqNo\": \"97426557\",\"visitNo\": \"1629086067\",\"sickName\": \"杨培恭\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:11\"},{\"seqNo\": \"97426559\",\"visitNo\": \"1629086067\",\"sickName\": \"杨培恭\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:12\"},{\"seqNo\": \"97426561\",\"visitNo\": \"1629086067\",\"sickName\": \"杨培恭\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:14\"},{\"seqNo\": \"97426567\",\"visitNo\": \"1629086067\",\"sickName\": \"杨培恭\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:15\"},{\"seqNo\": \"97426570\",\"visitNo\": \"1407999064\",\"sickName\": \"蔡美花\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:24\"},{\"seqNo\": \"97426572\",\"visitNo\": \"1407999064\",\"sickName\": \"蔡美花\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:24\"},{\"seqNo\": \"97426574\",\"visitNo\": \"1407999064\",\"sickName\": \"蔡美花\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:24\"},{\"seqNo\": \"97426576\",\"visitNo\": \"1547551020\",\"sickName\": \"黄靖宇\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:44\"},{\"seqNo\": \"97426581\",\"visitNo\": \"1547551020\",\"sickName\": \"黄靖宇\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:46\"},{\"seqNo\": \"97426583\",\"visitNo\": \"1547551020\",\"sickName\": \"黄靖宇\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:47\"},{\"seqNo\": \"97426591\",\"visitNo\": \"1547551020\",\"sickName\": \"黄靖宇\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:48\"},{\"seqNo\": \"97426642\",\"visitNo\": \"1613276019\",\"sickName\": \"黄英连\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:13\"},{\"seqNo\": \"97426649\",\"visitNo\": \"1613276019\",\"sickName\": \"黄英连\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:56:16\"},{\"seqNo\": \"97426654\",\"visitNo\": \"1613276019\",\"sickName\": \"黄英连\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:18\"},{\"seqNo\": \"97426704\",\"visitNo\": \"1408701039\",\"sickName\": \"胡玮坤\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:56:40\"},{\"seqNo\": \"97426705\",\"visitNo\": \"1408701039\",\"sickName\": \"胡玮坤\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:40\"},{\"seqNo\": \"97426713\",\"visitNo\": \"1408701039\",\"sickName\": \"胡玮坤\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:40\"},{\"seqNo\": \"97426714\",\"visitNo\": \"1408701039\",\"sickName\": \"胡玮坤\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:56:40\"},{\"seqNo\": \"97426719\",\"visitNo\": \"1900545011\",\"sickName\": \"李光婷\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:42\"},{\"seqNo\": \"97426724\",\"visitNo\": \"1900545011\",\"sickName\": \"李光婷\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:56:42\"},{\"seqNo\": \"97426934\",\"visitNo\": \"1719779006\",\"sickName\": \"吴玉秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 08:00:20\"},{\"seqNo\": \"97427072\",\"visitNo\": \"1719779006\",\"sickName\": \"吴玉秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 08:00:22\"},{\"seqNo\": \"97427377\",\"visitNo\": \"1537583008\",\"sickName\": \"刘阿花\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 08:02:37\"},{\"seqNo\": \"97427380\",\"visitNo\": \"1537583008\",\"sickName\": \"刘阿花\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 08:02:39\"},{\"seqNo\": \"97427383\",\"visitNo\": \"1537583008\",\"sickName\": \"刘阿花\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 08:02:41\"},{\"seqNo\": \"97427390\",\"visitNo\": \"1398769053\",\"sickName\": \"徐丽松\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 08:02:48\"}],\"total\": 12296}}"; + BaseResponse> baseResponse = JSONObject.parseObject(response, new TypeReference>>() { }); @@ -1110,8 +1139,11 @@ public class HlfyyyClient extends CommonHttpClient { @Override public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { - return null; - } + + udiwmsWarehouseRequest.setDatabaseProductName(getDataSourceType()); + PageSimpleResponseNew pageSimpleResponseNew = va004Service.filterList(udiwmsWarehouseRequest); + log.info("解析四川武平县医院返回仓库信息，返回结果：{}", pageSimpleResponseNew.getList()); + return ResultVOUtils.success(pageSimpleResponseNew); } @Override public BaseResponse testConnect() { @@ -1428,7 +1460,7 @@ public class HlfyyyClient extends CommonHttpClient { public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { if (IntUtil.value(udiwmsBasicSkPrescribeRequest.getInOutType()) == 0) { udiwmsBasicSkPrescribeRequest.setDatabaseProductName(getDataSourceType()); - IPage iPage = va010Service.getList(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); + IPage iPage = va010Service.getList(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),udiwmsBasicSkPrescribeRequest); // List list = iPage.getRecords(); // PageInfo pageInfo = new PageInfo<>(list); // PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); @@ -1713,11 +1745,6 @@ public class HlfyyyClient extends CommonHttpClient { ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()); ioCollectOrder.setFromCorpName(item.getSickname()); ioCollectOrder.setShipperName(item.getDeptname()); - if (item.getRemark().equals("门诊")) { - ioCollectOrder.setBusType("YPCF002"); - } else { - ioCollectOrder.setBusType("YPCF003"); - } Date date = null; try { date = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").parse(item.getPrescribedate()); @@ -1781,7 +1808,6 @@ public class HlfyyyClient extends CommonHttpClient { return ResultVOUtils.error(500, "下载失败!"); } } - public static List summarizeByCode(List bizList) { Map summarizedMap = new HashMap<>(); @@ -1872,6 +1898,7 @@ public class HlfyyyClient extends CommonHttpClient { } + public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) { //摆药流水号 // String stoout_no = ioCollectOrder.getBackupOrderRemark1(); @@ -2128,11 +2155,45 @@ public class HlfyyyClient extends CommonHttpClient { @Override public BaseResponse getBuyType() { - Map buyTypeMap = new HashMap<>(); - buyTypeMap.put("buyType_3501", buyType_3501); - buyTypeMap.put("buyType_3502", buyType_3502); - buyTypeMap.put("buyType_3505", buyType_3505); - buyTypeMap.put("buyType_3506", buyType_3506); + Map buyTypeMap= new HashMap<>(); + buyTypeMap.put("buyType_3501",buyType_3501); + buyTypeMap.put("buyType_3502",buyType_3502); + buyTypeMap.put("buyType_3505",buyType_3505); + buyTypeMap.put("buyType_3506",buyType_3506); return ResultVOUtils.success(buyTypeMap); } + + + public void oracleCompatibleCopy(Object source, Object target) { + try { + Class sourceClass = source.getClass();//得到对象的Class + Class targetClass = target.getClass();//得到对象的Class + + Field[] sourceFields = sourceClass.getDeclaredFields();//得到Class对象的所有属性 + Field[] targetFields = targetClass.getDeclaredFields();//得到Class对象的所有属性 + + for(Field sourceField : sourceFields){ + sourceField.setAccessible(true); + String name = sourceField.getName();//属性名 + Class type = sourceField.getType();//属性类型 + Object value = sourceField.get(source); + + for(Field targetField : targetFields){ + targetField.setAccessible(true); + + String targetName = targetField.getName();//目标对象的属性名 + + if(targetName.toLowerCase().equals(name.toLowerCase()) && !Objects.isNull(value)){ + targetField.set(target,value); + } + } + } + }catch (Exception e){ + BeanUtil.copyProperties(source,target); + + } + + } + + } diff --git a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA002.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA002.java index 7e6c55f..fa30db5 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA002.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA002.java @@ -40,73 +40,73 @@ public class VA002 implements Serializable { private String manufactory; @TableField(value = "SUPCODE") - private String SUPCODE; + private String supcode; @TableField(value = "SUPNAME") - private String SUPNAME; + private String supname; @TableField(value = "CPLB") - private String CPLB; + private String cplb; @TableField(value = "FLBM") - private String FLBM; + private String flbm; @TableField(value = "QXLB") - private String QXLB; + private String qxlb; @TableField(value = "YBBM") - private String YBBM; + private String ybbm; @TableField(value = "SPTM") - private String SPTM; + private String sptm; @TableField(value = "TYSHXYDM") - private String TYSHXYDM; + private String tyshxydm; @TableField(value = "YLQXZCRBARMC") - private String YLQXZCRBARMC; + private String ylqxzcrbarmc; @TableField(value = "YLQXZCRBARYWMC") - private String YLQXZCRBARYWMC; + private String ylqxzcrbarywmc; @TableField(value = "CPMS") - private String CPMS; + private String cpms; @TableField(value = "SPMC") - private String SPMC; + private String spmc; @TableField(value = "QTBM") - private String QTBM; + private String qtbm; @TableField(value = "ZCZYXQZ") - private String ZCZYXQZ; + private String zczyxqz; @TableField(value = "PRICE") - private String PRICE; + private String price; @TableField(value = "RETAILPRICE") - private String RETAILPRICE; + private String retailprice; @TableField(value = "INVCODE") - private String INVCODE; + private String invcode; @TableField(value = "REMARK") - private String REMARK; + private String remark; @TableField(value = "REMARK1") - private String REMARK1; + private String remark1; @TableField(value = "REMARK2") - private String REMARK2; + private String remark2; @TableField(value = "REMARK3") - private String REMARK3; + private String remark3; @TableField(value = "REMARK4") - private String REMARK4; + private String remark4; @TableField(value = "REMARK5") - private String REMARK5; + private String remark5; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java index 3830c93..a0bdeab 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsWarehouseRequest.java @@ -17,5 +17,6 @@ public class UdiwmsWarehouseRequest extends ListPageRequest { * 货位号，支持模糊查询 */ private String warehouseCode; + private String databaseProductName; } diff --git a/src/main/java/com/glxp/mipsdl/res/PageSimpleResponseNew.java b/src/main/java/com/glxp/mipsdl/res/PageSimpleResponseNew.java new file mode 100644 index 0000000..7f5d187 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/res/PageSimpleResponseNew.java @@ -0,0 +1,29 @@ +package com.glxp.mipsdl.res; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 简单的分页返回对象 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PageSimpleResponseNew { + // 总数 + private Integer total; + // 列表 + private List list; + + public void setTotal(Long total) { + + this.total = total.intValue(); + } + public void setTotal(Integer total) { + + this.total = total.intValue(); + } +} diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java index 52d23ce..82b0487 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA001Service.java @@ -1,6 +1,8 @@ package com.glxp.mipsdl.service.hlfyyy; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageHelper; +import com.glxp.mipsdl.entity.hlfyyy.VA010; import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; import com.glxp.mipsdl.thirddao.hlfyyy.VA001Mapper; import org.springframework.stereotype.Service; @@ -12,12 +14,8 @@ import com.glxp.mipsdl.entity.hlfyyy.VA001; @Service public class VA001Service extends ServiceImpl { public List filterList(UdiwmsUnitRequest udiwmsUnitRequest) { - if (null == udiwmsUnitRequest) { - return Collections.emptyList(); - } - if (null != udiwmsUnitRequest.getPage() && null != udiwmsUnitRequest.getLimit()) { - PageHelper.offsetPage((udiwmsUnitRequest.getPage() - 1) * udiwmsUnitRequest.getLimit(), udiwmsUnitRequest.getLimit()); - } - return this.baseMapper.filterList(udiwmsUnitRequest); + Page page = new Page(udiwmsUnitRequest.getPage(), udiwmsUnitRequest.getLimit()); + + return this.baseMapper.filterList(page,udiwmsUnitRequest); } } diff --git a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java index 07ff986..f2e1363 100644 --- a/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java +++ b/src/main/java/com/glxp/mipsdl/service/hlfyyy/VA004Service.java @@ -1,10 +1,30 @@ package com.glxp.mipsdl.service.hlfyyy; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageInfo; +import com.glxp.mipsdl.entity.hlfyyy.VA010; +import com.glxp.mipsdl.req.base.UdiwmsWarehouseRequest; +import com.glxp.mipsdl.res.PageSimpleResponse; +import com.glxp.mipsdl.res.PageSimpleResponseNew; import com.glxp.mipsdl.thirddao.hlfyyy.VA004Mapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.mipsdl.entity.hlfyyy.VA004; + +import javax.annotation.Resource; +import java.util.List; + @Service public class VA004Service extends ServiceImpl { - + @Resource + private VA004Mapper va004Mapper; + public PageSimpleResponseNew filterList(UdiwmsWarehouseRequest udiwmsWarehouseRequest){ + Page page = new Page(udiwmsWarehouseRequest.getPage(), udiwmsWarehouseRequest.getLimit()); + List list = va004Mapper.filterList(page,udiwmsWarehouseRequest); + PageSimpleResponseNew pageSimpleResponseNew = new PageSimpleResponseNew<>(); + pageSimpleResponseNew.setList(list); + pageSimpleResponseNew.setTotal(list.size()); + return pageSimpleResponseNew; + } } diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA001Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA001Mapper.java index b74ad84..591c5e5 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA001Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA001Mapper.java @@ -2,15 +2,17 @@ package com.glxp.mipsdl.thirddao.hlfyyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.mipsdl.entity.hlfyyy.VA001; import com.glxp.mipsdl.req.base.UdiwmsUnitRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper @DS("hlfyyySql") public interface VA001Mapper extends BaseMapper { - List filterList(UdiwmsUnitRequest udiwmsUnitRequest); + List filterList(Page page, @Param("req") UdiwmsUnitRequest udiwmsUnitRequest); } diff --git a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA004Mapper.java b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA004Mapper.java index a41fc24..f9c1745 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA004Mapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/hlfyyy/VA004Mapper.java @@ -2,10 +2,16 @@ package com.glxp.mipsdl.thirddao.hlfyyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.glxp.mipsdl.entity.hlfyyy.VA004; +import com.glxp.mipsdl.req.base.UdiwmsWarehouseRequest; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper @DS("hlfyyySql") public interface VA004Mapper extends BaseMapper { + List filterList(Page page, UdiwmsWarehouseRequest udiwmsWarehouseRequest); } diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA001Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA001Mapper.xml index cfb0dde..2402df9 100644 --- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA001Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA001Mapper.xml @@ -19,47 +19,26 @@ diff --git a/src/main/resources/mybatis/mapper/master/hlfyyy/VA004Mapper.xml b/src/main/resources/mybatis/mapper/master/hlfyyy/VA004Mapper.xml index bb3aac9..8cd30ae 100644 --- a/src/main/resources/mybatis/mapper/master/hlfyyy/VA004Mapper.xml +++ b/src/main/resources/mybatis/mapper/master/hlfyyy/VA004Mapper.xml @@ -12,4 +12,21 @@ CODE, `NAME`, REMARK +