From 8d4ad0d13ef71e22cc1036e2c6c00aafb20ed597 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 十二月 2024 17:41:58 +0800
Subject: [PATCH] 电路试验的驻波比csv报告解析
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
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 82fe3a8..db0d87e 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
@@ -16,10 +17,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -27,11 +25,14 @@
public class ReportServiceImpl implements ReportService {
private InsOrderMapper insOrderMapper;
+ private InsSampleMapper insSampleMapper;
private InsProductUserMapper insProductUserMapper;
private InsProductMapper insProductMapper;
private GetLook getLook;
private ScheduleMapper scheduleMapper;
private UserMapper userMapper;
+ private RoleMapper roleMapper;
+ private InsSampleUserMapper insSampleUserMapper;
//姣忔棩涓氬姟缁熻
@Override
@@ -210,6 +211,8 @@
//棣栭〉-->鏃ュ巻浠诲姟鍥�
@Override
public Map<String, Object> calendarWorkByWeek() {
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ String name = roleMapper.selectById(userMapper.selectById(userId).getRoleId()).getName();
Map<String, Object> map = new HashMap<>();
List<Integer> insState = new ArrayList<>();
insState.add(0);
@@ -217,17 +220,37 @@
/*鑾峰彇鍚庝竴鍛ㄦ棩鏈�*/
LocalDate currentDate = LocalDate.now();
List<LocalDate> weekDays = new ArrayList<>();
- for (int i = 6; i >= 0; i--) {
+ for (int i = 6, j = 0; i >= 0; i--, j++) {
weekDays.add(currentDate.minusDays(i));
//鏌ヨ褰撳ぉ闇�瑕佹娴嬬殑濮旀墭璁㈠崟
List<InsOrder> insOrders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery()
.eq(InsOrder::getState, 1)
.in(InsOrder::getInsState, insState)
- .apply("DATE(create_time) = CURDATE() - INTERVAL " + i + " DAY"));
+ .apply("DATE(create_time) = CURDATE() - INTERVAL " + j + " DAY"));
+ //濡傛灉褰撳墠鐧诲綍浜烘槸娴嬭瘯宸ョ▼甯堟垨鑰呮槸妫�娴嬬粍闀�,闇�瑕佽繃婊ゅ嚭妫�楠屼汉鏄粬浠殑璁㈠崟鎴栬�呮槸杩樻病妫�楠岀殑璁㈠崟
+ 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()
+ .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("閫佹牱鍛�")){
+ insOrders = insOrders.stream().filter(insOrder ->
+ ObjectUtils.isNotEmpty(insOrder.getIssueUser()) && insOrder.getIssueUser().equals(userId)
+ ).collect(Collectors.toList());
+ }
List<Map<String, Object>> works = insOrders.stream().map(insOrder -> {
+ List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insOrder.getId()));
HashMap<String, Object> hashMap = new HashMap<>();
- hashMap.put("text", "濮旀墭璁㈠崟" + insOrder.getEntrustCode() + "妫�娴�");
+ hashMap.put("text", insOrder.getEntrustCode());
+ hashMap.put("sample", insSamples.stream().map(InsSample::getSample).collect(Collectors.joining(",")));
hashMap.put("type", insOrder.getType());
+ hashMap.put("state", insOrder.getState());
User user = userMapper.selectById(insOrder.getCreateUser());
hashMap.put("name", user.getName());
return hashMap;
--
Gitblit v1.9.3