diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java index ca164f14..288abdcd 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/BaseProductDTO.java @@ -233,6 +233,46 @@ public class BaseProductDTO extends BaseEntity { /** 其它 */ @Excel(name = "其它") private String other; + /**标准模板**/ + private String mvgr5; + /**单位**/ + private String meins; + //转换分子 + private String umrez; + //转换分母 + private String umren; + + public String getUmren() { + return umren; + } + + public void setUmren(String umren) { + this.umren = umren; + } + + public String getUmrez() { + return umrez; + } + + public void setUmrez(String umrez) { + this.umrez = umrez; + } + + public String getMeins() { + return meins; + } + + public void setMeins(String meins) { + this.meins = meins; + } + + public String getMvgr5() { + return mvgr5; + } + + public void setMvgr5(String mvgr5) { + this.mvgr5 = mvgr5; + } public void setCategory(String category) { this.category = category; diff --git a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml index 9b22b75d..1cdab4a6 100644 --- a/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/report/ReportPointWaterMapper.xml @@ -75,16 +75,16 @@ and price = #{price} and (report_point_water.monitor_id = #{monitorSubset} OR report_point_water.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 begin_time between #{params.beginBeginTime} and #{params.endBeginTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginBeginTime} and #{params.endBeginTime} - and begin_time between #{params.startTime} and #{params.endTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.startTime} and #{params.endTime} - and begin_time between #{params.beginCollectTime} and #{params.endCollectTime} + and CONVERT(VARCHAR(17), begin_time, 120) between #{params.beginCollectTime} and #{params.endCollectTime} and begin_time = #{beginTime} and end_time = #{endTime} @@ -116,9 +116,9 @@ where report_point_water.objid = #{objid} select ert.monitor_id, ert.monitor_name, ert.pointTime, sum(if(ert.expend is null, 0, ert.expend)) expend from ( - select rpd.monitor_id, m.monitor_name, left(rpd.begin_time, 10) pointTime, rpd.expend + select rpd.monitor_id, m.monitor_name, left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) pointTime, rpd.expend from report_point_water rpd left join base_monitor_info m on m.monitor_id = rpd.monitor_id @@ -158,7 +158,7 @@ and rpd.begin_time between #{startTime} and #{endTime} - and left(rpd.begin_time, 10) between #{startDay} and #{endDay} + and left(CONVERT(VARCHAR(17), rpd.begin_time, 120), 10) between #{startDay} and #{endDay} ) ert @@ -168,21 +168,21 @@ @@ -385,6 +406,22 @@ ) + + insert into base_product( + product_code,product_desc_zh,product_group,product_group_name, + meins,product_model,umrez,umren,mvgr5, + gross_weight,volume + ,create_by,create_time + ) values + + ( + #{item.productCode},#{item.productDescZh},#{item.productGroup},#{item.productGroupName}, + #{item.meins},#{item.productModel},#{item.umrez},#{item.umren},#{item.mvgr5}, + #{item.grossWeight},#{item.volume}, + 'oa',GETDATE() + ) + + + diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java index 9a4c1882..3c18292d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java @@ -7,10 +7,7 @@ import java.time.Duration; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -309,11 +306,11 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService } logger.info("质检检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); if (!CollectionUtils.isEmpty(wecharts)) { - new Thread(() -> { + CompletableFuture.runAsync(() -> { + System.out.println("异步执行企业微信发送"); AjaxResult result = remoteOpenService.sendWeChartMessage(wecharts); logger.info("质检检验企业微信提醒结果：" + JSONObject.toJSONString(result)); - - }).start(); + }); } //发企业微信--------------------结束 }