From 38d64e3f70d101c0461a8b5fe5f07f803d3b0905 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 28 八月 2024 16:20:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 c4debd3..0b93eee 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
@@ -145,20 +145,25 @@
}
this.saveBatch(damageList);
}
-
+ /**
+ * 鎷胯蛋鎵撳嵃鏁版嵁鏌ヨ
+ */
@Override
- public List<Damage> selectDamagePrint(Damage damage) {
- QueryWrapper<Damage> wrapper = new QueryWrapper<>();
- wrapper.select("working_procedure,engineer_id,teams_groups_name,device_name,count(glass_id)as glass_id")
- .eq("type",damage.getType())
- .eq("working_procedure",damage.getWorkingProcedure())
- .groupBy("working_procedure,engineer_id,teams_groups_name,device_name");
- if (damage.getEngineerId() != null) {
- wrapper.eq("engineer_id", damage.getEngineerId());
- }
- return this.list(wrapper);
+ public List<DamagePrint> selectDamagePrint(Damage damage) {
+ MPJQueryWrapper<Damage> listDamage=new MPJQueryWrapper<Damage>()
+ .select("t.engineer_id,t.glass_id,b.tempering_layout_id,b.tempering_feed_sequence,b.width,b.height,b.thickness")
+ .leftJoin("glass_info as b on t.glass_id=b.glass_id")
+ .eq("t.working_procedure",damage.getWorkingProcedure())
+ .eq("t.type",damage.getType());
+ // 鍔ㄦ�佹坊鍔犳潯浠讹紝褰� id 鏈夊�兼椂
+ if (damage.getEngineerId() != null) {
+ listDamage.eq("t.engineer_id", damage.getEngineerId());
+ }
+ return damageMapper.selectJoinList(DamagePrint.class,listDamage);
}
-
+ /**
+ * 鎷胯蛋鎵撳嵃鎵撳嵃璇︽儏鏌ヨ
+ */
@Override
public List<DamagePrint> selectDamagePrintDetails(Damage damage) {
List<DamagePrint> listDamage=damageMapper.selectJoinList(DamagePrint.class,new MPJQueryWrapper<Damage>()
--
Gitblit v1.8.0