From aad28a866d7d200e1228f7a5d053348e7f9653a4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 17 十二月 2024 13:47:38 +0800
Subject: [PATCH] 统计+首页+电路试验提交bug
---
inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java | 12 ++-
inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 22 ++++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 171 +++++++++++++++++++++++++++++++++++-------
inspect-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOutputWorkingHoursDto.java | 15 +++
6 files changed, 187 insertions(+), 37 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
index eeb5f00..bc672bf 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -24,14 +24,14 @@
@ValueClassify("缁熻鍥捐〃")
@ApiOperation(value = "鏌ヨ姣忔棩涓氬姟缁熻")
@GetMapping("/businessStatisticsByDay")
- public Result businessStatisticsByDay(){
- return Result.success(reportService.businessStatisticsByDay());
+ public Result businessStatisticsByDay(String startTime,String endTime,String type){
+ return Result.success(reportService.businessStatisticsByDay(startTime,endTime,type));
}
@ValueClassify("缁熻鍥捐〃")
@ApiOperation(value = "鏌ヨ妫�娴嬮」鐩粺璁�")
@GetMapping("/testProductByDay")
- public Result testProductByDay(){
- return Result.success(reportService.testProductByDay());
+ public Result testProductByDay(String startTime,String endTime,String type){
+ return Result.success(reportService.testProductByDay(startTime,endTime,type));
}
@ValueAuth
@ApiOperation(value = "鏌ヨ鏃ュ巻浠诲姟鍥�")
@@ -52,4 +52,18 @@
public Result ScheduleByMe(String date){
return Result.success(reportService.ScheduleByMe(date));
}
+
+ @ValueAuth
+ @ApiOperation(value = "鍚勭珯鐐瑰伐鏃�")
+ @PostMapping("/manHourByStation")
+ public Result manHourByStation(String startTime,String endTime){
+ return Result.success(reportService.manHourByStation(startTime,endTime));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鍚勭珯鐐瑰伐鏃舵瘡涓汉鎵�鍗犵櫨鍒嗘瘮")
+ @PostMapping("/manHourByPerson")
+ public Result manHourByPerson(String startTime,String endTime){
+ return Result.success(reportService.manHourByPerson(startTime,endTime));
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOutputWorkingHoursDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOutputWorkingHoursDto.java
new file mode 100644
index 0000000..7ec0db1
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/AuxiliaryOutputWorkingHoursDto.java
@@ -0,0 +1,15 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.AuxiliaryOutputWorkingHours;
+import lombok.Data;
+
+@Data
+public class AuxiliaryOutputWorkingHoursDto extends AuxiliaryOutputWorkingHours {
+
+ //绔欑偣
+ private String sonLaboratory;
+
+ private String getSonLaboratoryFromDto(AuxiliaryOutputWorkingHoursDto dto) {
+ return dto.getSonLaboratory();
+ }
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
index ff1bf71..c4bd75b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/ReportService.java
@@ -3,18 +3,16 @@
import com.yuanchu.mom.pojo.Schedule;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
public interface ReportService {
//姣忔棩涓氬姟缁熻
- Map<String,Object> businessStatisticsByDay();
+ Map<String,Object> businessStatisticsByDay(String startTime,String endTime,String type);
//妫�娴嬮」鐩粺璁�
- Map<String,Object> testProductByDay();
+ Map<String,Object> testProductByDay(String startTime,String endTime,String type);
//棣栭〉-->鏃ュ巻浠诲姟鍥�
Map<String,Object> calendarWorkByWeek();
@@ -24,4 +22,10 @@
//棣栭〉-->鎴戠殑鏃ョ▼
List<Schedule> ScheduleByMe(String date);
+
+ //棣栭〉-->鍚勭珯鐐瑰伐鏃�
+ Map<String,Double> manHourByStation(String startTime,String endTime);
+
+ //棣栭〉-->鍚勭珯鐐瑰伐鏃舵瘡涓汉鎵�鍗犵櫨鍒嗘瘮
+ Map<String, Map<String, Double>> manHourByPerson(String startTime, String endTime);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 7b7aded..b3a28d5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -1204,7 +1204,7 @@
insSampleUserMapper.insert(insSampleUser);
/*鐢熸垚鐢佃矾璇曢獙鐨勭珯鐐规姤鍛婂苟涓婁紶鍒伴檮浠朵腑*/
if (submitPlanDto.getLaboratory().equals("鐢佃矾璇曢獙")) {
- //wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
+// wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
//todo 鐢佃矾绔欑偣鎶ュ憡 姝ｅ紡搴撻儴缃叉斁寮�
try {
wordUtils.generateWord(submitPlanDto.getTerm(), orderState);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
index db0d87e..907fc32 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java
@@ -6,11 +6,13 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.dto.AuxiliaryOutputWorkingHoursDto;
import com.yuanchu.mom.dto.CostStatisticsDto;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.ReportService;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -33,27 +35,55 @@
private UserMapper userMapper;
private RoleMapper roleMapper;
private InsSampleUserMapper insSampleUserMapper;
+ private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
//姣忔棩涓氬姟缁熻
@Override
- public Map<String, Object> businessStatisticsByDay() {
+ public Map<String, Object> businessStatisticsByDay(String startTime,String endTime,String type) {
+ DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
+ LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
+ LocalDateTime oldStart=start ;
+ LocalDateTime oldEnd=end ;
+ switch (type){
+ case "鍛�":
+ oldStart = start.minusDays(7);
+ oldEnd = end.minusDays(7);
+ break;
+ case "鏈�":
+ oldStart = start.minusMonths(1);
+ oldEnd = end.minusMonths(1);
+ break;
+ case "骞�":
+ oldStart = start.minusYears(1);
+ oldEnd = end.minusYears(1);
+ break;
+ }
Map<String, Object> map = new HashMap<>();
/*浠诲姟鎺ユ敹*/
//浠婃棩浠诲姟鎺ユ敹
- Long receive = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).apply("DATE(create_time) = CURDATE()"));
+ Long receive = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
+ .eq(InsOrder::getState, 1)
+ .between(InsOrder::getCreateTime, start, end));
map.put("RECEIVE", receive);
//鏄ㄦ棩浠诲姟鎺ユ敹
- Long received = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
+ Long received = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
+ .eq(InsOrder::getState, 1)
+ .between(InsOrder::getCreateTime, oldStart, oldEnd));
//姣斾緥=(浠婂ぉ-鏄ㄥぉ)/鏄ㄥぉ
BigDecimal ratio = new BigDecimal(receive - received).divide(new BigDecimal(received == 0 ? 1 : received), 2, BigDecimal.ROUND_HALF_UP);
map.put("RECEIVE_RATIO", ratio);
/*浠诲姟宸插畬鎴�*/
//浠婃棩浠诲姟瀹屾垚
- Long finishe = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 4).apply("DATE(create_time) = CURDATE()"));
+ Long finishe = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
+ .eq(InsOrder::getState, 4)
+ .between(InsOrder::getCreateTime, start, end));
map.put("FINISHE", finishe);
//鏄ㄦ棩浠诲姟瀹屾垚
- Long finished = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 4).apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
+ Long finished = insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
+ .eq(InsOrder::getState, 4)
+ .between(InsOrder::getCreateTime, oldStart, oldEnd));
//浠诲姟瀹屾垚姣斾緥=(浠婂ぉ-鏄ㄥぉ)/鏄ㄥぉ
BigDecimal finishedRatio = new BigDecimal(finishe - finished).divide(new BigDecimal(finished == 0 ? 1 : finished), 2, BigDecimal.ROUND_HALF_UP);
map.put("FINISHE_RATIO", finishedRatio);
@@ -71,7 +101,7 @@
/*妫�娴嬭垂鐢�*/
//浠婃棩妫�娴嬭垂鐢�
QueryWrapper<CostStatisticsDto> costStatisticsDtoQueryWrappers = new QueryWrapper<>();
- costStatisticsDtoQueryWrappers.eq("create_time", LocalDateTime.now());
+ costStatisticsDtoQueryWrappers.between("create_time", start,end);
IPage<CostStatisticsDto> page = new Page<>();
page.setSize(-1);
page.setCurrent(-1);
@@ -83,7 +113,7 @@
map.put("PRICE", price);
//鏄ㄦ棩妫�娴嬭垂鐢�
QueryWrapper<CostStatisticsDto> costWrappers = new QueryWrapper<>();
- costWrappers.eq("create_time", LocalDateTime.now().minusDays(1));
+ costWrappers.between("create_time", oldStart,oldEnd);
IPage<CostStatisticsDto> dtoIPage = insOrderMapper.selectCostStatistics(page, costWrappers);
BigDecimal priced = BigDecimal.ZERO;
for (CostStatisticsDto record : dtoIPage.getRecords()) {
@@ -112,11 +142,13 @@
/*妫�娴嬩汉鍛�*/
//浠婃棩妫�娴嬩汉鍛�
- List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery().apply("DATE(create_time) = CURDATE()"));
+ List<InsProductUser> insProductUsers = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
+ .between(InsProductUser::getCreateTime, start, end));
long person = insProductUsers.stream().map(InsProductUser::getCreateUser).distinct().count();
map.put("PERSON", person);
//鏄ㄦ棩妫�娴嬩汉鍛�
- List<InsProductUser> insProductUserss = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery().apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
+ List<InsProductUser> insProductUserss = insProductUserMapper.selectList(Wrappers.<InsProductUser>lambdaQuery()
+ .between(InsProductUser::getCreateTime, oldStart, oldEnd));
long persons = insProductUserss.stream().map(InsProductUser::getCreateUser).distinct().count();
//姣斾緥=(浠婂ぉ-鏄ㄥぉ)/鏄ㄥぉ
BigDecimal personRatio = new BigDecimal(person - persons).divide(new BigDecimal(persons == 0 ? 1 : persons), 2, BigDecimal.ROUND_HALF_UP);
@@ -124,14 +156,20 @@
/*杩戝崄鏃ヤ换鍔℃帴鏀堕噺涓庡畬鎴愰噺*/
//鑾峰彇杩戝崄鏃ョ殑妯潗鏍�
- LocalDate currentDate = LocalDate.now();
+ LocalDate startDate = LocalDate.parse(startTime, format);
+ LocalDate endDate = LocalDate.parse(endTime, format);
List<LocalDate> lastTenDays = new ArrayList<>();
List<Long> receTenDays = new ArrayList<>();
List<Long> finTenDays = new ArrayList<>();
- for (int i = 9; i > -1; i--) {
- lastTenDays.add(currentDate.minusDays(i));
- receTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")));
- finTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 4).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")));
+ while (!startDate.isAfter(endDate)) {
+ lastTenDays.add(startDate);
+ receTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
+ .eq(InsOrder::getState, 1)
+ .between(InsOrder::getCreateTime,startDate.atStartOfDay(),startDate.atTime(23,59,59))));
+ finTenDays.add(insOrderMapper.selectCount(Wrappers.<InsOrder>lambdaQuery()
+ .eq(InsOrder::getState, 4)
+ .between(InsOrder::getCreateTime,startDate.atStartOfDay(),startDate.atTime(23,59,59))));
+ startDate = startDate.plusDays(1);
}
map.put("DAYS", lastTenDays);
map.put("RECETENDAYS", receTenDays);
@@ -141,24 +179,39 @@
//妫�娴嬮」鐩粺璁�
@Override
- public Map<String, Object> testProductByDay() {
+ public Map<String, Object> testProductByDay(String startTime,String endTime,String type) {
+ DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
+ LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
+ LocalDateTime oldStart=start ;
+ LocalDateTime oldEnd=end ;
Map<String, Object> map = new HashMap<>();
/*椤圭洰鎺ユ敹*/
//浠婃棩椤圭洰鎺ユ敹閲�
- Long receive = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).apply("DATE(create_time) = CURDATE()"));
+ Long receive = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .between(InsProduct::getCreateTime, start, end));
map.put("RECEVICE", receive);
//鏄ㄦ棩椤圭洰鎺ユ敹閲�
- Long received = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
+ Long received = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .between(InsProduct::getCreateTime, oldStart, oldEnd));
//姣斾緥=(浠婂ぉ-鏄ㄥぉ)/鏄ㄥぉ
BigDecimal ratio = new BigDecimal(receive - received).divide(new BigDecimal(received == 0 ? 1 : received), 2, BigDecimal.ROUND_HALF_UP);
map.put("RECEIVE_RATIO", ratio);
/*椤圭洰瀹屾垚*/
//浠婃棩椤圭洰瀹屾垚閲�
- Long finishe = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).isNotNull(InsProduct::getInsResult).apply("DATE(create_time) = CURDATE()"));
+ Long finishe = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .isNotNull(InsProduct::getInsResult)
+ .between(InsProduct::getCreateTime, start, end));
map.put("FINISHE", finishe);
//鏄ㄦ棩椤圭洰瀹屾垚閲�
- Long finished = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).isNotNull(InsProduct::getInsResult).apply("DATE(create_time) = CURDATE() - INTERVAL 1 DAY"));
+ Long finished = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .isNotNull(InsProduct::getInsResult)
+ .between(InsProduct::getCreateTime, oldStart, oldEnd));
//浠诲姟瀹屾垚姣斾緥=(浠婂ぉ-鏄ㄥぉ)/鏄ㄥぉ
BigDecimal finishedRatio = new BigDecimal(finishe - finished).divide(new BigDecimal(finished == 0 ? 1 : finished), 2, BigDecimal.ROUND_HALF_UP);
map.put("FINISHE_RATIO", finishedRatio);
@@ -175,7 +228,10 @@
/*浠婃棩椤圭洰鍚堟牸鐜�*/
//浠婃棩瀹屾垚閲忎腑鐨勫悎鏍奸噺/浠婃棩瀹屾垚閲�
- Long accept = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).eq(InsProduct::getInsResult,1).apply("DATE(create_time) = CURDATE()"));
+ Long accept = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .eq(InsProduct::getInsResult, 1)
+ .between(InsProduct::getCreateTime, start, end));
map.put("ACCEPT", accept);
BigDecimal acceptRate = new BigDecimal(accept).divide(new BigDecimal(finishe == 0 ? 1 : finishe), 2, BigDecimal.ROUND_HALF_UP);
map.put("ACCEPT_RATE_TODAY", acceptRate);
@@ -192,14 +248,21 @@
/*杩戝崄鏃ョ殑椤圭洰鎺ユ敹閲忎笌瀹屾垚閲�*/
//鑾峰彇杩戝崄鏃ョ殑妯潗鏍�
- LocalDate currentDate = LocalDate.now();
+ LocalDate startDate = LocalDate.parse(startTime, format);
+ LocalDate endDate = LocalDate.parse(endTime, format);
List<LocalDate> lastTenDays = new ArrayList<>();
List<Long> receTenDays = new ArrayList<>();
List<Long> finTenDays = new ArrayList<>();
- for (int i = 9; i > -1; i--) {
- lastTenDays.add(currentDate.minusDays(i));
- receTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")));
- finTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getState, 1).isNotNull(InsProduct::getInsResult).apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY")));
+ while (!startDate.isAfter(endDate)) {
+ lastTenDays.add(startDate);
+ receTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .between(InsProduct::getCreateTime,startDate.atStartOfDay(),startDate.atTime(23,59,59))));
+ finTenDays.add(insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState, 1)
+ .isNotNull(InsProduct::getInsResult)
+ .between(InsProduct::getCreateTime,startDate.atStartOfDay(),startDate.atTime(23,59,59))));
+ startDate = startDate.plusDays(1);
}
map.put("DAYS", lastTenDays);
map.put("RECETENDAYS", receTenDays);
@@ -228,18 +291,19 @@
.in(InsOrder::getInsState, insState)
.apply("DATE(create_time) = CURDATE() - INTERVAL " + j + " DAY"));
//濡傛灉褰撳墠鐧诲綍浜烘槸娴嬭瘯宸ョ▼甯堟垨鑰呮槸妫�娴嬬粍闀�,闇�瑕佽繃婊ゅ嚭妫�楠屼汉鏄粬浠殑璁㈠崟鎴栬�呮槸杩樻病妫�楠岀殑璁㈠崟
- if (name.equals("娴嬭瘯宸ョ▼甯�") || name.equals("妫�娴嬬粍闀�")){
+ if (name.equals("娴嬭瘯宸ョ▼甯�") || name.equals("妫�娴嬬粍闀�")) {
insOrders = insOrders.stream().filter(insOrder -> {
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insOrder.getId()));
List<Integer> sampleId = insSamples.stream().map(InsSample::getId).collect(Collectors.toList());
List<InsSampleUser> insSampleUsers = insSampleUserMapper.selectList(Wrappers.<InsSampleUser>lambdaQuery()
+ .in(InsSampleUser::getInsSampleId, sampleId)
.eq(InsSampleUser::getState, 0) //妫�楠屼汉
- .in(InsSampleUser::getInsSampleId, sampleId));
+ );
return insSampleUsers.size() == 0 || insSampleUsers.stream().map(InsSampleUser::getUserId).collect(Collectors.toList()).contains(userId);
}).collect(Collectors.toList());
}
//濡傛灉褰撳墠鐧诲綍浜烘槸閫佹牱鍛�,闇�杩囨护鍑哄崟瀛愮殑閫佹牱鍛樻槸褰撳墠浜虹殑璁㈠崟
- else if (name.equals("閫佹牱鍛�")){
+ else if (name.equals("閫佹牱鍛�")) {
insOrders = insOrders.stream().filter(insOrder ->
ObjectUtils.isNotEmpty(insOrder.getIssueUser()) && insOrder.getIssueUser().equals(userId)
).collect(Collectors.toList());
@@ -283,4 +347,55 @@
LocalDateTime endTime = localDate.plusDays(1).atStartOfDay().minusSeconds(1);
return scheduleMapper.selectList(Wrappers.<Schedule>lambdaQuery().eq(Schedule::getUserId, userId).between(Schedule::getScheduleTime, startTime, endTime));
}
+
+ //棣栭〉-->鍚勭珯鐐圭殑宸ユ椂
+ @Override
+ public Map<String, Double> manHourByStation(String startTime, String endTime) {
+ DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
+ LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
+ //鏌ヨ杩欎釜鏃堕棿鍐呮墍鏈夌殑宸ユ椂
+ List<AuxiliaryOutputWorkingHours> auxiliaryOutputWorkingHours = auxiliaryOutputWorkingHoursMapper.selectList(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
+ .between(AuxiliaryOutputWorkingHours::getCreateTime, start, end));
+ //鏍规嵁妫�楠岄」鏌ュ嚭鏉ョ殑绔欑偣杩涜鍒嗙被
+ List<AuxiliaryOutputWorkingHoursDto> outputWorkingHoursDtos = auxiliaryOutputWorkingHours.stream().map(auxiliaryOutputWorkingHours1 -> {
+ AuxiliaryOutputWorkingHoursDto auxiliaryOutputWorkingHoursDto = new AuxiliaryOutputWorkingHoursDto();
+ BeanUtils.copyProperties(auxiliaryOutputWorkingHours1, auxiliaryOutputWorkingHoursDto);
+ InsProduct insProduct = insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId());
+ auxiliaryOutputWorkingHoursDto.setSonLaboratory(insProduct.getSonLaboratory());
+ return auxiliaryOutputWorkingHoursDto;
+ }).collect(Collectors.toList());
+ Map<String, Double> map = outputWorkingHoursDtos.stream()
+ .collect(Collectors.groupingBy(
+ AuxiliaryOutputWorkingHoursDto::getSonLaboratory,
+ Collectors.summingDouble(AuxiliaryOutputWorkingHours::getOutputWorkTime)));
+ return map;
+ }
+
+ //棣栭〉-->鍚勭珯鐐瑰伐鏃舵瘡涓汉鎵�鍗犵櫨鍒嗘瘮
+ @Override
+ public Map<String, Map<String, Double>> manHourByPerson(String startTime, String endTime) {
+ DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime start = LocalDate.parse(startTime, format).atStartOfDay();
+ LocalDateTime end = LocalDate.parse(endTime, format).atTime(23, 59, 59);
+ //鏌ヨ杩欎釜鏃堕棿鍐呮墍鏈夌殑宸ユ椂
+ List<AuxiliaryOutputWorkingHours> auxiliaryOutputWorkingHours = auxiliaryOutputWorkingHoursMapper.selectList(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
+ .between(AuxiliaryOutputWorkingHours::getCreateTime, start, end));
+ //鏍规嵁妫�楠岄」鏌ュ嚭鏉ョ殑绔欑偣杩涜鍒嗙被
+ List<AuxiliaryOutputWorkingHoursDto> outputWorkingHoursDtos = auxiliaryOutputWorkingHours.stream().map(auxiliaryOutputWorkingHours1 -> {
+ AuxiliaryOutputWorkingHoursDto auxiliaryOutputWorkingHoursDto = new AuxiliaryOutputWorkingHoursDto();
+ BeanUtils.copyProperties(auxiliaryOutputWorkingHours1, auxiliaryOutputWorkingHoursDto);
+ InsProduct insProduct = insProductMapper.selectById(auxiliaryOutputWorkingHours1.getInsProductId());
+ auxiliaryOutputWorkingHoursDto.setSonLaboratory(insProduct.getSonLaboratory());
+ return auxiliaryOutputWorkingHoursDto;
+ }).collect(Collectors.toList());
+ Map<String, Map<String, Double>> mapMap = outputWorkingHoursDtos.stream()
+ .collect(Collectors.groupingBy(
+ AuxiliaryOutputWorkingHoursDto::getSonLaboratory,
+ Collectors.groupingBy(
+ t -> userMapper.selectById(t.getCheck()).getName(),
+ Collectors.summingDouble(AuxiliaryOutputWorkingHours::getOutputWorkTime))));
+
+ return mapMap;
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
index 2ab885a..0eebbe8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java
@@ -106,6 +106,7 @@
InsSample insSample = insSampleMapper.selectById(insOrderState.getInsSampleId());
//鏌ヨ椤圭洰
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState,1)
.eq(InsProduct::getInsSampleId, insSample.getId())
.eq(InsProduct::getSonLaboratory, "鐢佃矾璇曢獙"));
//鑾峰彇鏈�澶х鍙ｆ暟閲�,瑙掑害鏁伴噺,棰戞鏁伴噺
@@ -2337,6 +2338,7 @@
//鏌ヨ椤圭洰
List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getState,1)
.eq(InsProduct::getInsSampleId, insSample.getId())
.eq(InsProduct::getSonLaboratory, "鐢佃矾璇曢獙"));
//鑾峰彇鏈�澶х鍙ｆ暟閲�,瑙掑害鏁伴噺,棰戞鏁伴噺
--
Gitblit v1.9.3