From ce61b02c2889a1ebdc71ff048a7836bbf1fe3208 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 14 八月 2023 10:21:34 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java | 8 ++++++--
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 11 +++--------
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java
index 20d8e9a..c2ea7db 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/EquipmentWorklineMapper.java
@@ -23,7 +23,7 @@
List<MdcEquipmentDto> getMacingDataList(@Param("tableName") String tableName);
@InterceptorIgnore(tenantLine = "1")
- @Select("select Sequencenumber,CollectTime from ${tableName} " +
+ @Select("select Sequencenumber,CollectTime from [${tableName}] " +
" where CollectTime > #{startTime} and CollectTime <= #{endTime} and Sequencenumber is not null" +
" order by CollectTime desc ")
List<Map<String, Object>> getEquipmentSequenceNumber(@Param("tableName") String tableName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
index b5233df..208b1aa 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/EquipmentWorkLineServiceImpl.java
@@ -36,8 +36,12 @@
@Transactional(readOnly = true)
public List<EquipmentMachingDto> getEquipmentSequencenumber(String drivetype, String equipmentid, Date startTime, Date endTime) {
String tableName = drivetype + "_" + equipmentid;
- List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
- return convertData(list);
+ try {
+ List<Map<String, Object>> list = equipmentWorkLineMapper.getEquipmentSequenceNumber(tableName, startTime, endTime);
+ return convertData(list);
+ } catch (Exception e) {
+ return null;
+ }
}
private List<EquipmentMachingDto> convertData(List<Map<String, Object>> list) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
index 1d529cf..0531cfc 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
@@ -59,15 +59,10 @@
Equipment equip = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, entity.getEquipmentId()));
if (equip != null) {
if (StringUtils.isNotBlank(equip.getDrivetype())) {
- try {
- List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype(), equip.getEquipmentid(), entity.getStartTime(), entity.getEndTime());
- if (esList != null && esList.size() > 1) {
- dto.setSequenceNumber(esList.get(0).getSequencenumber());
- }
- } catch (Exception e) {
- continue;
+ List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype(), equip.getEquipmentid(), entity.getStartTime(), entity.getEndTime());
+ if (esList != null && esList.size() > 1) {
+ dto.setSequenceNumber(esList.get(0).getSequencenumber());
}
-
}
}
}
--
Gitblit v1.9.3