From 4db2530d1bd178289b4f017967432caefb9435e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 四月 2024 14:46:44 +0800
Subject: [PATCH] 首页的日历任务+我的日程,资质明细
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ReportServiceImpl.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 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 820ae14..c044f08 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
@@ -4,13 +4,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.CostStatisticsDto;
-import com.yuanchu.mom.mapper.InsOrderMapper;
-import com.yuanchu.mom.mapper.InsProductMapper;
-import com.yuanchu.mom.mapper.InsProductUserMapper;
-import com.yuanchu.mom.pojo.InsOrder;
-import com.yuanchu.mom.pojo.InsProduct;
-import com.yuanchu.mom.pojo.InsProductUser;
+import com.yuanchu.mom.mapper.*;
+import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.ReportService;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
@@ -20,10 +17,12 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
@AllArgsConstructor
@@ -32,6 +31,9 @@
private InsOrderMapper insOrderMapper;
private InsProductUserMapper insProductUserMapper;
private InsProductMapper insProductMapper;
+ private GetLook getLook;
+ private ScheduleMapper scheduleMapper;
+ private UserMapper userMapper;
//姣忔棩涓氬姟缁熻
@Override
@@ -157,4 +159,55 @@
/*杩戝崄鏃ョ殑椤圭洰鎺ユ敹閲忎笌瀹屾垚閲�*/
return map;
}
+
+ //棣栭〉-->鏃ュ巻浠诲姟鍥�
+ @Override
+ public Map<String, Object> calendarWorkByWeek() {
+ Map<String, Object> map = new HashMap<>();
+ List<Integer> insState=new ArrayList<>();
+ insState.add(0);
+ insState.add(1);
+ /*鑾峰彇鍚庝竴鍛ㄦ棩鏈�*/
+ LocalDate currentDate = LocalDate.now();
+ List<LocalDate> weekDays = new ArrayList<>();
+ for (int i = 0; i <7; i++) {
+ weekDays.add(currentDate.plusDays(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"));
+ List<Map<String,Object>> works = insOrders.stream().map(insOrder -> {
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("text","濮旀墭璁㈠崟" + insOrder.getEntrustCode() + "妫�娴�");
+ hashMap.put("type",insOrder.getType());
+ User user = userMapper.selectById(insOrder.getCreateUser());
+ hashMap.put("name", user.getName());
+ return hashMap;
+ }).collect(Collectors.toList());
+ map.put("work"+i, works);
+ }
+ map.put("weekDays", weekDays);
+ return map;
+ }
+
+ //棣栭〉-->娣诲姞鏃ョ▼
+ @Override
+ public int addSchedule(String time, String text) {
+ //鑾峰彇褰撳墠鐢ㄦ埛id
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ Schedule schedule = new Schedule();
+ schedule.setUserId(userId);
+ schedule.setScheduleTime(LocalDateTime.parse(time, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ schedule.setText(text);
+ return scheduleMapper.insert(schedule);
+ }
+
+ //棣栭〉-->鎴戠殑鏃ョ▼
+ @Override
+ public List<Schedule> ScheduleByMe(String date) {
+ //鑾峰彇褰撳墠鐢ㄦ埛id
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ LocalDateTime startTime = localDate.atStartOfDay();
+ LocalDateTime endTime = localDate.plusDays(1).atStartOfDay().minusSeconds(1);
+ return scheduleMapper.selectList(Wrappers.<Schedule>lambdaQuery().eq(Schedule::getUserId,userId).between(Schedule::getScheduleTime,startTime,endTime));
+ }
}
--
Gitblit v1.9.3