From 61cae17b15d6a7d256e25ce42f0a4ef4163fd088 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 15:54:03 +0800
Subject: [PATCH] 1、删除未修改的大屏程序
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index ac51c77..dd61074 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -60,7 +60,11 @@
@Override
public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
+ if (endTime != null && !endTime.isEmpty()) {
+ endTime = endTime + " 23:59:59";
+ }
damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
+ damageSelectWrapper.ne(Damage::getStatus, 7);
if (type != 0) {
damageSelectWrapper.eq(Damage::getType, type);
}
@@ -69,11 +73,6 @@
}
if (!"0".equals(workingProcedure)) {
damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
- }
- List<Damage> damageList = baseMapper.selectList(damageSelectWrapper);
-
- for (Damage damage : damageList) {
- damage.setStatus(2);
}
return baseMapper.selectList(damageSelectWrapper);
}
@@ -134,7 +133,7 @@
}
}
reportingWorkDetails.add(reportingWorkDetail);
- reportingWorkDetail.setDamageDetailsList(damageDetailses);
+ reportingWorkDetail.setDamageDetails(damageDetailses);
sendToERP(reportingWork, reportingWorkDetails);
}
}
@@ -175,6 +174,7 @@
damage1 = baseMapper.selectList(
new LambdaQueryWrapper<Damage>()
.in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .lt(Damage::getStatus, 7)
.eq(Damage::getGlassId, damage.getGlassId())
);
} else {
@@ -284,6 +284,7 @@
new LambdaQueryWrapper<Damage>()
.eq(Damage::getGlassId, glassId)
.in(Damage::getType, Const.GLASS_STATE_DAMAGE_TAKE)
+ .lt(Damage::getStatus, 7)
);
}
@@ -316,7 +317,7 @@
// 灏� JSON 瀵硅薄鍜屾暟缁勬坊鍔犲埌缁撴灉瀵硅薄涓�
result.put("title", reportingWorkJson);
result.put("detail", detailsJsonArray);
- result.put("type", 0);
+ result.put("type", 1);
result.put("userId", "admin");
result.put("userName", "admin");
result.put("qualityInsStatus", 0);
--
Gitblit v1.8.0