From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 07 八月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
index ce35e08..47f829c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.pp.entity.ReportingWork;
+import com.mes.pp.entity.request.AwaitingRepair;
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.pp.mapper.ReportingWorkMapper;
import com.mes.pp.mapper.request.AwaitingRepairMapper;
@@ -19,7 +20,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -29,18 +30,26 @@
@DS("pp")
@Slf4j
public class ReportingWorkServiceImpl extends ServiceImpl<ReportingWorkMapper, ReportingWork> implements ReportingWorkService {
-@Autowired
-private ReportingDamageMapper reportingDamageMapper;
-@Autowired
-private AwaitingRepairMapper awaitingRepairMapper;
+ @Autowired
+ private ReportingDamageMapper reportingDamageMapper;
+ @Autowired
+ private AwaitingRepairMapper awaitingRepairMapper;
+
@Override
public List<Reportingdamage> selectDamage(Reportingdamage reportingdamage) {
- QueryWrapper<Reportingdamage>queryWrapper=new QueryWrapper<>();
- queryWrapper.eq("this_process",reportingdamage.getThisProcess())
- .eq("device_name",reportingdamage.getDeviceName())
- .le("reporting_work_time", LocalDateTime.now());
+ QueryWrapper<Reportingdamage> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("this_process,sum(completed_quantity) as completedQuantity,sum(breakage_quantity) as breakageQuantity ")
+ //.eq("this_process", reportingdamage.getThisProcess())
+ //.eq("device_name",reportingdamage.getDeviceName())
+ .ge("reporting_work_time", reportingdamage.getReportingWorkTime())
+ .groupBy("this_process");
return reportingDamageMapper.selectList(queryWrapper);
-// rw.reporting_work_time BETWEEN '2024/05/12'and'2024/06/20' and rw.this_process = '纾ㄨ竟' and rw.device_name = '蹇�熺（'
+ }
+ @Override
+ public List<AwaitingRepair> selectAwaitingRepair() {
+ QueryWrapper<AwaitingRepair> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("*");
+ return awaitingRepairMapper.selectList(queryWrapper);
}
}
--
Gitblit v1.8.0