From 26a63c4d8679fac85eee0b377c252c816efd231d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 20 九月 2024 11:28:32 +0800
Subject: [PATCH] 掰片识别增加筛选破损玻璃时增加条件，过滤掉Damage type字段不等于8或9的数据
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 65 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 26 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..8f6a1a6 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
@@ -1,10 +1,9 @@
package com.mes.damage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
+import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.mapper.DamageMapper;
@@ -20,8 +19,6 @@
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -48,15 +45,15 @@
* 鏌ヨ鎶ュ伐淇℃伅
*/
@Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
+ public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) {
LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
if (type != 0) {
damageSelectWrapper.eq(Damage::getType, type);
}
- if (status != 0) {
- damageSelectWrapper.eq(Damage::getStatus, status);
- }
+// if (status != 0) {
+// damageSelectWrapper.eq(Damage::getStatus, status);
+// }
if (!"0".equals(workingProcedure)) {
damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
}
@@ -146,28 +143,44 @@
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>()
+ .select("b.flow_card_id,b.layer,t.engineer_id,b.tempering_layout_id,b.tempering_feed_sequence,t.glass_id,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())
+ .eq("t.engineer_id", damage.getEngineerId())
+ );
+ return listDamage;
}
@Override
- public List<DamagePrint> selectDamagePrintDetails(Damage damage) {
- List<DamagePrint> listDamage=damageMapper.selectJoinList(DamagePrint.class,new MPJQueryWrapper<Damage>()
- .select("b.flow_card_id,b.layer,t.engineer_id,b.tempering_layout_id,b.tempering_feed_sequence,t.glass_id,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())
- .eq("t.engineer_id",damage.getEngineerId())
+ public void deleteByGlassId(String glassId) {
+ baseMapper.delete(
+ new LambdaQueryWrapper<Damage>()
+ .eq(Damage::getGlassId, glassId)
+ .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
);
- return listDamage;
}
}
--
Gitblit v1.8.0