From aacbd7e7bfee3604d22388801b45955a26f746fa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 21 八月 2023 13:39:38 +0800
Subject: [PATCH] 改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
index 5819ccd..8eb52e3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -1,13 +1,18 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.yuanchu.limslaboratory.mapper.PlanMapper;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yuanchu.limslaboratory.mapper.*;
+import com.yuanchu.limslaboratory.pojo.InspectionProduct;
+import com.yuanchu.limslaboratory.pojo.Instrument;
+import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.InstrumentService;
import com.yuanchu.limslaboratory.service.PlanService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -23,39 +28,41 @@
@Resource
private PlanMapper planMapper;
- /**
- * 鏌ヨ妫�楠岃鍒�
- *
- * @return
- */
+ @Resource
+ InspectionProductMapper inspectionProductMapper;
+
+ @Resource
+ UserMapper userMapper;
+
+ @Resource
+ InstrumentMapper instrumentMapper;
+
+ //鏌ヨ妫�楠岃鍒�
@Override
- public List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user) {
- //鑾峰彇鏁版嵁搴撴暟鎹�
- List<PlanVo> planVos = planMapper.selectAllPlan(device, beginTime, endTime, user);
- //娣诲姞璁″垝宸ユ湡鍜屾楠岃繘搴�
- planVos.forEach(planVo -> {
- //娣诲姞妫�楠岃繘搴�
- //鍒ゆ柇鏄惁鏄凡瀹屾垚
- if (planVo.getState() != null) {
- planVo.setProgress(100);
- }
- //鍒ゆ柇鏄惁鏄湭鍒嗛厤
- if (planVo.getCheckproject() == null) {
- planVo.setProgress(0);
- }
- //鍒ゆ柇鏄惁鏄繘琛屼腑
- if (planVo.getState() == null && planVo.getCheckproject() != null) {
- planVo.setProgress(50);
- }
- //娣诲姞璁″垝宸ユ湡
- if (planVo.getFinishtime() != null && planVo.getStarttime() != null) {
- long startTimeInMillis = planVo.getStarttime().getTime();
- long endTimeInMillis = planVo.getFinishtime().getTime();
- long durationInMillis = endTimeInMillis - startTimeInMillis;
- long duration = durationInMillis / (1000 * 60 * 60);
- planVo.setDuration(Integer.valueOf((int) duration));
- }
- });
- return planVos;
+ public List<Map<String,Object>> selectAllPlan(String code , String beginTime, String endTime,Integer status) {
+ return planMapper.selectAllPlan(code,beginTime,endTime,status);
+ }
+
+ //鍒嗛厤-->閫夋嫨妫�楠屼汉
+ @Override
+ public List<Map<String, Object>> choosecheck() {
+ return userMapper.selectUser();
+ }
+
+ //鍒嗛厤-->閫夋嫨璁惧
+ @Override
+ public List<Map<String, Object>> chooseinstum() {
+ return null;
+ }
+
+ //鍒嗛厤浜哄憳涓庤澶�
+ @Override
+ public String distribution(Integer id, Integer userId, Integer instrumentId) {
+ InspectionProduct inspectionProduct = new InspectionProduct();
+ inspectionProduct.setId(id);
+ inspectionProduct.setUserId(userId);
+ inspectionProduct.setInstrumentId(instrumentId);
+ inspectionProductMapper.updateById(inspectionProduct);
+ return "鍒嗛厤瀹屾垚!";
}
}
--
Gitblit v1.9.3