From 4b55cf8d21443e366f83acf20c4333abef8f54ae Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 3
standard-server/src/main/resources/mapper/ProductMapper.xml | 15 ++
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 23 +++
sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java | 6 -
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 2
inspection-server/src/main/resources/mapper/PlanMapper.xml | 69 +++++++----
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java | 8 -
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 12 -
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java | 4
/dev/null | 4
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProductModel.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 79 +++++++------
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 4
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 42 +++++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java | 8 -
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java | 6
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 2
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java | 6
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java | 24 ++-
23 files changed, 194 insertions(+), 142 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index ff18b98..fd379d3 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -90,7 +90,7 @@
return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
}
- @ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏")
+ @ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ妫�楠屽崟璇︽儏")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
})
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialController.java
deleted file mode 100644
index 63ace1b..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialController.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.yuanchu.limslaboratory.service.InspectionMaterialService;
-
-/**
- * (鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂�(InspectionMaterial)琛ㄦ帶鍒跺眰
- *
- * @author zss
- * @since 2023-08-03 13:04:28
- */
-@Api(tags = "(鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂欐帴鍙�")
-@RestController
-@RequestMapping("/inspectionMaterial")
-public class InspectionMaterialController {
-
- @Autowired
- private InspectionMaterialService inspectionMaterialService;
-
-}
-
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductController.java
deleted file mode 100644
index 8203159..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-
-import com.yuanchu.limslaboratory.pojo.InspectionProduct;
-import com.yuanchu.limslaboratory.pojo.vo.InsProductVo;
-import com.yuanchu.limslaboratory.service.InstrumentService;
-import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.RedisUtil;
-import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.service.InspectionProductService;
-
-import javax.annotation.Resource;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鐢宠鍗曚笅鐗╂枡涓殑椤圭洰(InspectionProduct)琛ㄦ帶鍒跺眰
- *
- * @author zss
- * @since 2023-08-03 13:04:54
- */
-@Api(tags = "璇曢獙绠＄悊-->妫�楠岀敵璇�-->妫�楠岄」鐩�")
-@RestController
-@RequestMapping("/inspectionProduct")
-public class InspectionProductController {
-
- @Autowired
- private InspectionProductService inspectionProductService;
-
- @Resource
- InstrumentService instrumentService;
-
- @ApiOperation(value = "鏌ヨ鎵�鏈夎澶�")
- @GetMapping("/selectInstrument")
- public Result selectInstrument() {
- return Result.success(instrumentService.selectInstrument());
- }
-
- @ApiOperation("閫夋嫨璁惧淇℃伅")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "璁惧ID", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/selectInstrumentById")
- public Result selectInstrumentById(Integer id) {
- String equipmentName = instrumentService.getById(id).getEquipmentName();
- return Result.success(equipmentName);
- }
-
-
- @ApiOperation(value = "鏇存柊妫�楠岄」鐩�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "testValue", value = "妫�娴嬪��", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "required", value = "鏍囧噯鍊�", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "internal", value = "鍐呮帶鍊�", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "name", value = "椤圭洰鍚嶇О", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "inspectionMaterialId", value = "鍐呮帶鍊�", dataTypeClass = Integer.class, required = true)
- })
- @PostMapping("/updateInsProduct")
- public Result updateInsProduct(@RequestHeader("token") String token, @RequestBody InspectionProduct inspectionProduct) throws Exception {
- Object object = RedisUtil.get(token);
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- Integer userId = (Integer) unmarshal.get("id");
- return Result.success(inspectionProductService.updateInsProduct(userId,inspectionProduct));
- }
-
-}
-
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 79bace6..84e6ac8 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -1,19 +1,17 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
-import java.util.*;
/**
* <p>
@@ -32,16 +30,38 @@
private PlanService planService;
- @ApiOperation("鏌ヨ妫�楠岃鍒�")
+ @ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "device", value = "璁惧鍚嶇ОId", dataTypeClass = String.class),
- @ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = Date.class),
- @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = Date.class),
- @ApiImplicitParam(name = "user", value = "妫�楠屼汉", dataTypeClass = String.class)
+ @ApiImplicitParam(name = "code", value = "鐢宠鍗曠紪鍙�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "status", value = "妫�楠岀粨鏋�", dataTypeClass = Integer.class)
})
@GetMapping("/selectAllPlan")
- public Result selectAllPlan(String device, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, String user) {
- List<PlanVo> planVoList = planService.selectAllPlan(device, beginTime, endTime, user);
- return Result.success(planVoList);
+ public Result selectAllPlan(String code, String beginTime, String endTime, Integer status) {
+ return Result.success(planService.selectAllPlan(code, beginTime, endTime, status));
+ }
+
+ @ApiOperation("鍒嗛厤-->閫夋嫨妫�楠屼汉")
+ @GetMapping("/choosecheck")
+ public Result choosecheck() {
+ return Result.success(planService.choosecheck());
+ }
+
+ @ApiOperation("鍒嗛厤--閫夋嫨璁惧")
+ @GetMapping("/chooseinstum")
+ public Result chooseinstum() {
+ return Result.success(planService.chooseinstum());
+ }
+
+ @ApiOperation("鍒嗛厤")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "userId", value = "妫�楠屼汉id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "instrumentId", value = "璁惧id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/distribution")
+ public Result distribution(Integer id, Integer userId, Integer instrumentId) {
+ return Result.success(planService.distribution(id, userId, instrumentId));
}
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
index b725119..7112d03 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
@@ -1,14 +1,10 @@
package com.yuanchu.limslaboratory.mapper;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
-
-import java.util.Date;
import java.util.List;
+import java.util.Map;
public interface PlanMapper {
- /**
- * 鏌ヨ妫�楠岃鍒�
- * @return
- */
- List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);
+
+ //鏌ヨ妫�楠岃鍒�
+ List<Map<String, Object>> selectAllPlan(String code, String beginTime, String endTime,Integer status);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
index 978a274..61d8e22 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
@@ -66,17 +66,13 @@
**/
private Integer state;
- /**
- * ${column.comment}
- **/
+
@TableField(fill = FieldFill.INSERT)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
- /**
- * ${column.comment}
- **/
+
@TableField(fill = FieldFill.INSERT_UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
deleted file mode 100644
index a2a6253..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.yuanchu.limslaboratory.pojo.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 妫�楠岃鍒扸O
- */
-@Data
-public class PlanVo {
- @ApiModelProperty(value = "璁惧鍚嶇О")
- @JsonSerialize
- private String device;
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
- @JsonSerialize
- private String samplename;
- @ApiModelProperty(value = "鏍峰搧缂栧彿")
- @JsonSerialize
- private String sampleid;
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
- @JsonSerialize
- private String modelandspecification;
- @ApiModelProperty(value = "鍗曚綅")
- @JsonSerialize
- private String unit;
- @ApiModelProperty(value = "鏁伴噺")
- @JsonSerialize
- private Integer amount;
- @ApiModelProperty(value = "妫�楠岄」鐩�")
- @JsonSerialize
- private String checkproject;
- @ApiModelProperty(value = "妫�楠屼汉")
- @JsonSerialize
- private String checker;
- @ApiModelProperty(value = "璁″垝宸ユ湡")
- @JsonSerialize
- private Integer duration;
- @ApiModelProperty(value = "妫�楠岃繘搴�0:鏈垎閰�, 50:妫�楠屼腑, 100:宸插畬鎴�")
- @JsonSerialize
- private Integer progress;
- @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
- private Date starttime;
- @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
- private Date finishtime;
-
- //鍒ゆ柇椤圭洰鐘舵��
- private Integer state;
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialService.java
deleted file mode 100644
index 3c65806..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.limslaboratory.pojo.InspectionMaterial;
-
-/**
- * (鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂�(InspectionMaterial)琛ㄦ湇鍔℃帴鍙�
- *
- * @author zss
- * @since 2023-08-03 13:04:28
- */
-public interface InspectionMaterialService extends IService<InspectionMaterial> {
-
-}
-
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java
index 3a367c5..b80f10d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java
@@ -12,12 +12,6 @@
*/
public interface InspectionProductService extends IService<InspectionProduct> {
- /**
- * 鏇存柊妫�楠岄」鐩�
- * @param userId
- * @param inspectionProduct
- * @return
- */
- boolean updateInsProduct(Integer userId, InspectionProduct inspectionProduct);
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
index 474e8ff..65c7ba6 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
@@ -1,9 +1,7 @@
package com.yuanchu.limslaboratory.service;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
-
-import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -18,6 +16,23 @@
* 鏌ヨ妫�楠岃鍒�
* @return
*/
- List<PlanVo> selectAllPlan(String device, Date beginTime, Date endTime, String user);
+ List<Map<String,Object>> selectAllPlan(String code , String beginTime, String endTime,Integer status);
+ /**
+ * 鍒嗛厤-->閫夋嫨妫�楠屼汉
+ * @return
+ */
+ List<Map<String,Object>> choosecheck();
+
+ /**
+ * 鍒嗛厤-->閫夋嫨璁惧
+ * @return
+ */
+ List<Map<String,Object>> chooseinstum();
+
+ /**
+ * 鍒嗛厤
+ * @return
+ */
+ String distribution(Integer id, Integer userId, Integer instrumentId);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialServiceImpl.java
deleted file mode 100644
index 60be3c0..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialServiceImpl.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.yuanchu.limslaboratory.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.limslaboratory.mapper.InspectionMaterialMapper;
-import com.yuanchu.limslaboratory.pojo.InspectionMaterial;
-import com.yuanchu.limslaboratory.service.InspectionMaterialService;
-import org.springframework.stereotype.Service;
-
-/**
- * (鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂�(InspectionMaterial)琛ㄦ湇鍔″疄鐜扮被
- *
- * @author zss
- * @since 2023-08-03 13:04:28
- */
-@Service
-public class InspectionMaterialServiceImpl extends ServiceImpl<InspectionMaterialMapper, InspectionMaterial> implements InspectionMaterialService {
-
-}
-
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java
index c07063c..7e63ffb 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java
@@ -22,7 +22,7 @@
@Resource
InspectionProductMapper inspectionProductMapper;
- //鏇存柊妫�楠岄」鐩�
+ /* //鏇存柊妫�楠岄」鐩�
@Override
public boolean updateInsProduct(Integer userId, InspectionProduct inspectionProduct) {
//璧嬪�兼楠屽憳id
@@ -38,7 +38,7 @@
.eq(InspectionProduct::getName, inspectionProduct.getName());
inspectionProductMapper.update(inspectionProduct, updateWrapper);
return true;
- }
+ }*/
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index c285546..66bfb6e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -16,6 +16,7 @@
import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -82,6 +83,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Integer addInspect(Integer id, InspectionVo inspectionVo) {
/*鏂板妫�楠岀敵璇疯〃*/
Inspection inspection = Inspection.builder()
@@ -142,6 +144,7 @@
//鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@Override
+ @Transactional(rollbackFor = Exception.class)
public InspectDetailVo selectInspectsListById(Integer id) {
/*灏嗘楠屽崟鍩烘湰淇℃伅鏌ヨ鍑烘潵骞跺皝瑁呭埌RawInspectVo瀵硅薄涓�*/
Inspection inspection = inspectionMapper.selectById(id);
@@ -187,6 +190,7 @@
//鏇存柊妫�楠屽崟妫�楠岀粨鏋�
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean updateInspectsById(Integer id) {
//鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀姸鎬佸拰妫�楠岀粨璁�
InspectDetailVo inspectDetailVo = selectInspectsListById(id);
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 "鍒嗛厤瀹屾垚!";
}
}
diff --git a/inspection-server/src/main/resources/mapper/InspectionMaterialMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMaterialMapper.xml
deleted file mode 100644
index d9f6112..0000000
--- a/inspection-server/src/main/resources/mapper/InspectionMaterialMapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionMaterialMapper">
-</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
deleted file mode 100644
index 93e3111..0000000
--- a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionProductMapper">
-</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index ed990c0..16f3557 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -1,39 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.PlanMapper">
-
+ <resultMap id="selectAllPlanMap" type="map" >
+ <id property="code" column="code"/>
+ <result property="inspectionStatus" column="inspectionStatus"/>
+ <result property="startTime" column="startTime"/>
+ <result property="endTime" column="endTime"/>
+ <collection property="father" resultMap="selectAllPlanMapTowMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="selectAllPlanMapTowMap" type="map">
+ <id property="samplename" column="samplename"/>
+ <collection property="chldren" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="selectAllPlanMapTowsMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="unit" column="unit"/>
+ <result property="required" column="required"/>
+ <result property="internal" column="internal"/>
+ <result property="testState" column="testState"/>
+ <result property="checker" column="checker"/>
+ <result property="instrumentname" column="instrumentname"/>
+ </resultMap>
<!--鏌ヨ妫�楠岃鍒�-->
- <select id="selectAllPlan" resultType="com.yuanchu.limslaboratory.pojo.vo.PlanVo">
- select i.equipment_name device,
+ <select id="selectAllPlan" resultMap="selectAllPlanMap">
+ select ip.id,
+ i.code,
+ inspection_status inspectionStatus,
+ DATE_FORMAT(start_time,'%Y-%m-%d') startTime,
+ DATE_FORMAT(end_time,'%Y-%m-%d') endTime,
im.name samplename,
- im.code sampleid,
- im.specifications modelandspecification,
- im.unit unit,
- im.num amount,
- ip.name checkproject,
+ ip.name,
+ ip.unit,
+ required,
+ internal,
+ test_state testState,
u.name checker,
- ip.start_time starttime,
- ip.end_time finishtime,
- ip.test_state state
- from instrument i
- left join (select ip.*
- from inspection_product ip
- right join (select instrument_id, max(ip.end_time) t
- from inspection_product ip
- group by instrument_id) it
- on ip.instrument_id = it.instrument_id and ip.end_time = it.t) ip
- on i.id = ip.instrument_id
- left join inspection_material im on im.id = ip.inspection_material_id
- left join user u on u.id = ip.user_id
+ equipment_name instrumentname
+ from lims_laboratory.inspection_product ip
+ left join lims_laboratory.inspection_material im on ip.inspection_material_id = im.id
+ left join lims_laboratory.inspection i on im.inspection_id = i.id
+ left join lims_laboratory.user u on ip.user_id = u.id
+ left join lims_laboratory.instrument isu on ip.instrument_id = isu.id
<where>
- <if test="device != null and device != null">
- and i.equipment_name = #{device}
+ <if test="code != null and code != null">
+ and i.code like concat('%',#{code},'%')
</if>
- <if test="user != null and user != null">
- and u.name = #{user}
+ <if test="status != null ">
+ and inspection_status = #{status}
</if>
<if test="beginTime != null and endTime != null">
- and ip.start_time between #{beginTime} and #{endTime}
+ and i.start_time between #{beginTime} and #{endTime}
</if>
</where>
</select>
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 7983e64..708ac38 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -3,7 +3,8 @@
<mapper namespace="com.yuanchu.limslaboratory.mapper.ReportMapper">
<!--鏌ヨ妫�楠屾姤鍛�-->
- <select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">select im.code materialCode,
+ <select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">
+ select im.code materialCode,
r.code reportCode,
i.code inspectionCode,
r.approver approver,
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
index 944bd9d..2af36d3 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
@@ -22,7 +22,6 @@
IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);
- //鏌ヨ鎵�鏈夎澶囦俊鎭�
- List<Map> selectInstrument();
+
}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
index 00c22c1..8c81d93 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java
@@ -35,10 +35,6 @@
Integer updateEquipmentPointInformation(Instrument instrument);
- /**
- * 鏌ヨ鎵�鏈夎澶囦俊鎭�
- * @return
- */
- List<Map> selectInstrument();
+
}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
index 5e91307..d69e41b 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java
@@ -81,9 +81,5 @@
return 0;
}
- //鏌ヨ鎵�鏈夎澶囦俊鎭�
- @Override
- public List<Map> selectInstrument() {
- return instrumentMapper.selectInstrument();
- }
+
}
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index ee31f57..3dcab6f 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -19,7 +19,5 @@
</if>
AND i.`user_id` = u.`id`
</select>
- <select id="selectInstrument" resultType="Map">
- select id,equipment_name from lims_laboratory.instrument
- </select>
+
</mapper>
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProductModel.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProductModel.java
index 8972287..75d8415 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProductModel.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/ProductModel.java
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
import lombok.experimental.Accessors;
import java.util.Date;
@@ -23,6 +20,7 @@
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
+@Builder
@TableName("product_model")
public class ProductModel implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
index 98351a8..d2bdf8c 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
@@ -1,5 +1,6 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.MaterialMapper;
import com.yuanchu.limslaboratory.mapper.ProductModelMapper;
@@ -45,19 +46,28 @@
//娣诲姞鏍囧噯
@Override
public void addproductModel(ProductModelDto productModelDto) {
- ProductModel productModel = new ProductModel();
- BeanUtils.copyProperties(productModelDto,productModel);
- productModelMapper.insert(productModel);
+ if (ObjectUtils.isEmpty(productModelDto.getFather())) {
+ ProductModel productModel = ProductModel.builder()
+ .name(productModelDto.getName())
+ .material(productModelDto.getMaterial())
+ .unit(productModelDto.getUnit())
+ .build();
+ productModelMapper.insert(productModel);
+ } else {
+ ProductModel productModel = new ProductModel();
+ BeanUtils.copyProperties(productModelDto, productModel);
+ productModelMapper.insert(productModel);
+ }
//娣诲姞鐗╂枡浜у搧搴�
Material material = new Material();
- material.setName(productModelDto.getName()).setCode(MyUtil.getTimeSixNumberCode("CP","CP"));
+ material.setName(productModelDto.getMaterial()).setCode(MyUtil.getTimeSixNumberCode("CP", "CP"));
materialMapper.insert(material);
}
//鏌ヨ鏍囧噯妯＄増鍒楄〃
@Override
public List<Map<String, Object>> selectproductModel(String name, String father, String material) {
- return productModelMapper.selectproductModel(name,father,material);
+ return productModelMapper.selectproductModel(name, father, material);
}
//鏍规嵁id鏌ヨ璇︽儏
@@ -65,7 +75,7 @@
public ProductModelDto selectproductModelById(Integer id) {
ProductModel productModel = productModelMapper.selectById(id);
ProductModelDto productModelDto = new ProductModelDto();
- BeanUtils.copyProperties(productModel,productModelDto);
+ BeanUtils.copyProperties(productModel, productModelDto);
return productModelDto;
}
@@ -73,7 +83,7 @@
@Override
public void writeproductModel(Integer id, ProductModelDto productModelDto) {
ProductModel productModel = new ProductModel();
- BeanUtils.copyProperties(productModelDto,productModel);
+ BeanUtils.copyProperties(productModelDto, productModel);
productModel.setId(id);
productModelMapper.updateById(productModel);
}
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 5de0d90..732c389 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -11,8 +11,21 @@
and material_id = #{materialId}
</select>
+
<!--灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->
- <select id="pageProductInformation" resultType="java.util.Map">
+ <resultMap id="pageProductInformationMap" type="map">
+ <id property="father" column="father"/>
+ <collection property="children" resultMap="pageProductInformationTowMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="pageProductInformationTowMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ <result property="unit" column="unit"/>
+ <result property="required" column="required"/>
+ <result property="internal" column="internal"/>
+ </resultMap>
+
+ <select id="pageProductInformation" resultMap="pageProductInformationMap">
select id,
name,
father,
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
index c594764..73201a9 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
@@ -1,6 +1,5 @@
package com.yuanchu.limslaboratory;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.utils.MyUtil;
@@ -8,20 +7,15 @@
import org.apache.poi.hwpf.extractor.WordExtractor;
import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import javax.annotation.Resource;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
@SpringBootTest
class SysApplicationTests {
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
index 232f21d..add3f16 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java
@@ -26,5 +26,7 @@
IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
- List<Map> selectUser();
+ List<Map<String,Object>> selectUser();
+
+
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index 7128e26..29107b5 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -75,7 +75,7 @@
* 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
* @return
*/
- List<Map> selectUser();
+ List<Map<String,Object>> selectUser();
/**
* 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 72be050..b3013e4 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -75,7 +75,7 @@
}
@Override
- public List<Map> selectUser() {
+ public List<Map<String,Object>> selectUser() {
return userMapper.selectUser();
}
--
Gitblit v1.9.3