From 951f2e3161f75b183862fe9f2f3a6d64a2a9f5be Mon Sep 17 00:00:00 2001 From: yinq Date: Wed, 22 May 2024 15:32:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20-=20=E6=B0=B4=E7=94=B5=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/record/RecordDnbInstantMapper.xml | 8 ++++---- .../resources/mapper/record/RecordWaterInstantMapper.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml b/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml index 1305bcbc..12c38729 100644 --- a/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/record/RecordDnbInstantMapper.xml @@ -44,7 +44,7 @@ and (record_dnb_instant.monitor_id = #{monitorSubset} OR record_dnb_instant.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) and vA = #{vA} and vB = #{vB} @@ -82,7 +82,7 @@ and rdi.monitor_id = #{monitorId} and (rdi.monitor_id = #{monitorSubset} OR rdi.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) and rdi.monitor_id IN @@ -93,7 +93,7 @@ group by rdi.monitor_id) md on md.monitor_id = d.monitor_id and md.collect_time = d.collect_time left join base_monitor_info m on m.monitor_id = d.monitor_id - left join (select rpd.monitor_id, ifnull(sum(rpd.expend), 0) consumption + left join (select rpd.monitor_id, isnull(sum(rpd.expend), 0) consumption from report_point_dnb rpd where rpd.begin_time between #{params.beginCollectTime} and #{params.endCollectTime} @@ -116,7 +116,7 @@ and bmi.monitor_id = #{monitorId} and (bmi.monitor_id = #{monitorSubset} OR bmi.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) diff --git a/op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml b/op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml index b0538665..8d0f070b 100644 --- a/op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/record/RecordWaterInstantMapper.xml @@ -35,7 +35,7 @@ and (record_water_instant.monitor_id = #{monitorSubset} OR record_water_instant.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) and flux_flow = #{fluxFlow} and water_flow = #{waterFlow} @@ -63,7 +63,7 @@ and rdi.monitor_id = #{monitorId} and (rdi.monitor_id = #{monitorSubset} OR rdi.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) and rdi.monitor_id IN @@ -74,7 +74,7 @@ group by rdi.monitor_id) md on md.monitor_id = d.monitor_id and md.collect_time = d.collect_time left join base_monitor_info m on m.monitor_id = d.monitor_id - left join (select rpd.monitor_id, ifnull(sum(rpd.expend), 0) consumption + left join (select rpd.monitor_id, isnull(sum(rpd.expend), 0) consumption from report_point_dnb rpd where rpd.begin_time between #{params.beginCollectTime} and #{params.endCollectTime} @@ -94,7 +94,7 @@ and bmi.monitor_id = #{monitorId} and (bmi.monitor_id = #{monitorSubset} OR bmi.monitor_id IN - (SELECT t.monitor_id FROM base_monitor_info t WHERE FIND_IN_SET(#{monitorSubset}, ancestors))) + (SELECT t.monitor_id FROM base_monitor_info t WHERE dbo.FIND_IN_SET(#{monitorSubset}, ancestors) > 0)) From 3332d91cd1af79cafe2668ffee1210ddc9a1ec95 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 22 May 2024 16:15:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2024-5-22=20open=E6=A8=A1=E5=9D=97-?= =?UTF-8?q?=E4=B8=8A=E4=BD=8D=E6=9C=BA=E6=8A=A5=E4=BF=AE=E6=96=B0=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E6=95=85=E9=9A=9C=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/system/api/domain/device/EquRepairOrderDTO.java | 10 ++++++++++ .../java/com/op/open/service/impl/OpenServiceImpl.java | 1 + 2 files changed, 11 insertions(+) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquRepairOrderDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquRepairOrderDTO.java index 434d1060..fd56d71b 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquRepairOrderDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquRepairOrderDTO.java @@ -12,6 +12,8 @@ public class EquRepairOrderDTO { private String userNickName; // 联系方式 private String phoneNumber; + // 故障描述 + private String orderDesc; public String getUserNickName() { return userNickName; @@ -52,4 +54,12 @@ public class EquRepairOrderDTO { public void setEquipmentCode(String equipmentCode) { this.equipmentCode = equipmentCode; } + + public String getOrderDesc() { + return orderDesc; + } + + public void setOrderDesc(String orderDesc) { + this.orderDesc = orderDesc; + } } diff --git a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java index 3f1357c2..ea98a3c8 100644 --- a/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java +++ b/op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java @@ -282,6 +282,7 @@ public class OpenServiceImpl implements OpenService { equRepairOrder.setOrderId(IdUtils.fastSimpleUUID());// id equRepairOrder.setEquipmentCode(equRepairOrderDTO.getEquipmentCode()); equRepairOrder.setOrderSource("上位机");// 故障来源 + equRepairOrder.setOrderDesc(equRepairOrderDTO.getOrderDesc());//故障描述 新增加的 equRepairOrder.setOrderTime(DateUtils.getNowDate());// 报修时间 equRepairOrder.setOrderBreakdownTime(DateUtils.getNowDate());// 故障时间 if (equRepairOrderDTO.getUserName() != null) { From 0f25ba8a3b03648074d4171ccf94ca9fe5ef3690 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Wed, 22 May 2024 16:20:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/service/impl/WmsProductPutServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index cf39aaa5..6ba5304a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -525,8 +525,12 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("LGORT", mesReportWork.getWhCode()); map.put("QUANTITY", mesReportWork.getQuantityQualified()); map.put("ERFME", mesReportWork.getUnit()); - String batch = mesReportWork.getBatch().substring(12); - map.put("BATCH", batch); + if (mesReportWork.getBatch().length()>12){ + String batch = mesReportWork.getBatch().substring(12); + map.put("BATCH", batch); + }else { + map.put("BATCH", mesReportWork.getBatch()); + } String formattedsDate = mesReportWork.getProductDate().replace("-", ""); map.put("HSDAT", formattedsDate); mapList.add(map);