From ee5f64ff15c79240681fc46b0201a293ccaf54ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 七月 2023 18:02:56 +0800
Subject: [PATCH] 检验模块
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java | 3
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 32 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java | 10
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java | 25 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 14
inspection-server/src/main/resources/mapper/PlanMapper.xml | 57 ++++-
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java | 12
standard-server/src/main/resources/mapper/MaterialMapper.xml | 13
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java | 89 ++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java | 7
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 4
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 4
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java | 18 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 36 ++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 5
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 71 ++++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 32 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 15 -
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java | 82 +++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java | 63 ++---
27 files changed, 445 insertions(+), 166 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 c0295d4..d26e03c 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
@@ -68,7 +68,7 @@
return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�")
+ @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "鎶ユ鍗旾D", dataTypeClass = String.class, required = true),
})
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
index 09bb02e..184292f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
@@ -1,6 +1,8 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.mapper.InspectionMapper;
+import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -12,6 +14,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
import java.util.Map;
/**
@@ -30,13 +34,24 @@
@Autowired
InspectionMaterialListService inspectionMaterialListService;
+ @Resource
+ InspectionMapper inspectionMapper;
+
@ApiOperation("娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�")
@PostMapping("/addInspectionMaterialList")
public Result addInspectionMaterialList(@RequestHeader("X-Token") String token, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
- inspectionMaterialList.setState(1);
- Object object = RedisUtil.get(token);
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- return Result.success(inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, "" + unmarshal.get("id")));
+ //濡傛灉妫�楠屽崟宸蹭綔搴�,鐘舵�佷负0,鍒欐棤娉曟坊鍔犳牱鍝�
+ Inspection inspection = inspectionMapper.selectById(inspectionMaterialList.getInspectionId());
+ if (inspection.getState()==0) {
+ return Result.fail("妫�楠屽崟宸蹭綔搴熸棤娉曟坊鍔犳楠屾牱鍝�");
+ }
+ else {
+ inspectionMaterialList.setState(1);
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ inspectionMaterialListService.addInspectionMaterialList(inspectionMaterialList, "" + unmarshal.get("id"));
+ return Result.success();
+ }
}
@ApiOperation("鍒犻櫎鏍峰搧")
@@ -45,10 +60,11 @@
})
@PostMapping("/delInspectionMaterialList")
public Result delInspectionMaterialList(int inspectionMaterialListId) {
- return Result.success(inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId));
+ inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId);
+ return Result.success();
}
- @ApiOperation("鏍规嵁Id鏌ヨ鏍峰搧淇℃伅")
+ @ApiOperation("鏍规嵁鏍峰搧Id鏌ヨ鏍峰搧淇℃伅")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
})
@@ -63,7 +79,7 @@
})
@PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) {
- return Result.success(inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialList));
+ inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialList);
+ return Result.success();
}
-
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
index e9d023e..c3c2dfa 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
@@ -1,7 +1,10 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -20,13 +23,16 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�-->鍒嗛厤璁″垝-->妫�楠岄」鐩�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屾牱鍝�-->妫�楠岄」鐩�")
@RestController
@RequestMapping("/inspection-product-list")
public class InspectionProductListController {
@Resource
UserService userService;
+
+ @Resource
+ InspectionProductListService inspectionProductListService;
@ApiOperation("鏌ヨ璇曢獙鍛樹俊鎭�")
@GetMapping("/selectUser")
@@ -42,4 +48,14 @@
public Result selectUserById(Integer id) {
return Result.success(userService.selectByUserId(id));
}
+
+ @ApiOperation("鏍规嵁妫�楠岃鍒掓牱鍝乮d鏌ヨ妫�楠岄」鐩�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectProductById/{id}")
+ public Result selectProductById(@PathVariable Integer id) {
+ return Result.success(inspectionProductListService.selectProductById(id));
+ }
+
}
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 665a37e..596848f 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
@@ -2,6 +2,7 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -39,22 +40,14 @@
return Result.success(planService.selectAllPlan(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠岃鍒掗噷闈㈢殑妫�楠岄」鐩�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/selectProductById/{id}")
- public Result selectProductById(@PathVariable Integer id) {
- return Result.success(planService.selectProductById(id));
- }
-
@ApiOperation("鍒嗛厤妫�楠岃鍒掍腑鍒嗛厤椤圭洰")
@PostMapping("/upPlan")
- public Result upPlan(@RequestBody InspectionProductList inspectionProductList) {
- planService.upPlan(inspectionProductList);
+ public Result upPlan(@RequestBody InspectionProductListDto inspectionProductListDto) {
+ planService.upPlan(inspectionProductListDto);
return Result.success();
}
+
@ApiOperation("浣滃簾妫�楠岃鍒�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "妫�楠岃鍒扞D", dataTypeClass = Integer.class, required = true),
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
index 678d663..6d49844 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
@@ -3,6 +3,7 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +20,7 @@
*/
public interface InspectionProductListMapper extends BaseMapper<InspectionProductList> {
- //娣诲姞妫�楠岄」鐩�
- int addInspectionProductList(List<InspectionProductList> list);
- //鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鐩�
- List<InspectionProductList> selectByMaterId(Integer id);
+ //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
+ List<InspectionProductListDto> selectByMaterId(Integer id);
}
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 71d375c..e9e152c 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
@@ -3,13 +3,14 @@
import com.yuanchu.limslaboratory.pojo.Plan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import java.util.List;
import java.util.Map;
/**
* <p>
- * Mapper 鎺ュ彛
+ * Mapper 鎺ュ彛
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -18,7 +19,7 @@
public interface PlanMapper extends BaseMapper<Plan> {
//鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
- Map selectAllPlan(int pageSize, int countSize, Integer state);
+ List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);
//鏌ヨ鎴愬搧妫�楠�
List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
index 7978c0d..8afabf1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -75,12 +75,12 @@
private Integer version;
- @ApiModelProperty(value = "鍏宠仈 鎶ユid")
+ @ApiModelProperty(value = "鍏宠仈 鎶ユ鐗╂枡id")
private int inspectionMaterialListId;
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
private Integer userId;
@ApiModelProperty(value = "鍏宠仈 璁惧id")
- private Integer instrument_id;
+ private Integer instrumentId;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
index f7cc10f..9593346 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
@@ -61,7 +61,5 @@
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id(璐熻矗浜篿d)")
private Integer userId;
- @ApiModelProperty(value = "鍏宠仈 璁惧id")
- private Integer deviceId;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
index 067c428..77fe3b8 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
@@ -2,8 +2,11 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.io.Serializable;
+@Data
public class InspectionDto extends Inspection implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java
new file mode 100644
index 0000000..64196c9
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java
@@ -0,0 +1,82 @@
+package com.yuanchu.limslaboratory.pojo.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+//鍒嗛厤璁″垝
+@Data
+public class InspectionProductListDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鎶ユ鏍峰搧id")
+ @JsonSerialize
+ private int inspectionMaterialListId;
+
+ @ApiModelProperty(value = "椤圭洰妫�楠屽紑濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "椤圭洰妫�楠岀粨鏉熸棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @JsonSerialize
+ private String name;
+
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
+ @JsonSerialize
+ private String method;
+
+ @ApiModelProperty(value = "璇曢獙瑕佹眰")
+ @JsonSerialize
+ private String ask;
+
+ @ApiModelProperty(value = "鍗曚綅")
+ @JsonSerialize
+ private String unit;
+
+ @ApiModelProperty(value = "鎷涙爣浜鸿姹傚��")
+ @JsonSerialize
+ private String required;
+
+ @ApiModelProperty(value = "鍐呮帶鍊�")
+ @JsonSerialize
+ private String internal;
+
+ @ApiModelProperty(value = "璇曢獙鍗曡瘯楠屽紑濮嬫棩鏈�", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date inspectStartTime;
+
+ @ApiModelProperty(value = "璇曢獙鍗曡瘯楠岀粨鏉熸棩鏈�", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date inspectEndTime;
+
+ @ApiModelProperty(value = "妫�楠岄」鐩瘯楠屽憳")
+ @JsonSerialize
+ private String userName;
+
+ @ApiModelProperty(value = "鍏宠仈 璁惧鍚�")
+ @JsonSerialize
+ private String instrumentName;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java
index d0d18d2..5c52ad7 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java
@@ -2,48 +2,53 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
+@Data
public class InspectionRecordsDto implements Serializable {
- //妫�娴嬮」鐩�
+
+ @ApiModelProperty(value = "妫�娴嬮」鐩�")
@JsonSerialize
private String name;
- //璇曢獙鍛�
+ @ApiModelProperty(value = "璇曢獙鍛�")
@JsonSerialize
private String userName;
- //璇曢獙寮�濮嬫棩鏈�
+ @ApiModelProperty(value = "璇曢獙寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
- //璇曢獙缁撴潫鏃ユ湡
+ @ApiModelProperty(value = "璇曢獙缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
- //璇曢獙鏂规硶
+ @ApiModelProperty(value = "璇曢獙鏂规硶")
@JsonSerialize
private String method;
- //璇曢獙瑕佹眰
+ @ApiModelProperty(value = "璇曢獙瑕佹眰")
@JsonSerialize
private String ask;
- //鏍峰搧缂栧彿
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
@JsonSerialize
private int mid;
- //鏍峰搧鍚嶇О
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
@JsonSerialize
private String materialName;
- //瑙勬牸鍨嬪彿
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
@JsonSerialize
private String specificationsSerialNumber;
- //鏍峰搧鏁伴噺
+ @ApiModelProperty(value = "鏍峰搧鏁伴噺")
@JsonSerialize
private Integer materialNum;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
index 95bbc4d..624f9d7 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
@@ -9,10 +9,13 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yuanchu.limslaboratory.pojo.Plan;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.util.Date;
+//鎴愬搧妫�楠�
+@Data
public class PlanDto implements Serializable {
@ApiModelProperty(value = "璁″垝缂栧彿")
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
new file mode 100644
index 0000000..4a6d592
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
@@ -0,0 +1,89 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//妫�楠岃鍒掑垎閰�
+@Data
+public class PlanVo implements Serializable {
+
+
+ @ApiModelProperty(value = "鏍峰搧缂栧彿")
+ @JsonSerialize
+ private Integer mid;
+
+ @ApiModelProperty(value = "鎶ユ鍗曠紪鍙�")
+ @JsonSerialize
+ private String inspectionId;
+
+ @ApiModelProperty(value = "瀹屾垚鎯呭喌 1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾")
+ @JsonSerialize
+ private Integer state;
+
+ @TableField(fill = FieldFill.INSERT)
+ @ApiModelProperty(value = "鐧昏鏃ユ湡", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ @ApiModelProperty(value = "璇曢獙璐熻矗浜�")
+ @JsonSerialize
+ private String name;
+
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
+ @JsonSerialize
+ private String materialName;
+
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @JsonSerialize
+ private String specificationsSerialNumber;
+
+ @ApiModelProperty(value = "鐗╂枡缂栧彿")
+ @JsonSerialize
+ private String materialId;
+
+ @ApiModelProperty(value = "鏉ユ簮")
+ @JsonSerialize
+ private String materialSupplier;
+
+ @ApiModelProperty(value = "椤圭洰璇曢獙寮�濮嬫棩鏈�", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty(value = "椤圭洰璇曢獙缁撴潫鏃ユ湡", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty(value = "璇曢獙缁撹")
+ @JsonSerialize
+ private String results;
+
+ @ApiModelProperty(value = "瀵硅薄浣嶇疆")
+ @JsonSerialize
+ private String materialLocation;
+
+ @ApiModelProperty(value = "妫�娴嬬瓥鐣�")
+ @JsonSerialize
+ private String method;
+
+ @ApiModelProperty(value = "鎵规")
+ @JsonSerialize
+ private String materialBatch;
+
+ @ApiModelProperty(value = "鐩樺彿")
+ @JsonSerialize
+ private String materialReelNumber;
+
+ @ApiModelProperty(value = "鏍峰搧鏁伴噺")
+ @JsonSerialize
+ private String materialNum;
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
index b709916..88f38bc 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
@@ -29,14 +29,14 @@
* @param userId
* @return
*/
- InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);
+ void addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);
/**
* 鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧淇℃伅
* @param inspectionMaterialListId
* @return
*/
- boolean delInspectionMaterialListByInsId(int inspectionMaterialListId);
+ void delInspectionMaterialListByInsId(int inspectionMaterialListId);
/**
*鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
@@ -44,5 +44,5 @@
* @param inspectionMaterialList
* @return
*/
- boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList);
+ void updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
index 726f8bd..1c9ff86 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
@@ -3,6 +3,7 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import java.util.List;
@@ -17,11 +18,14 @@
public interface InspectionProductListService extends IService<InspectionProductList> {
+
+
/**
- * 鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧閲岀殑妫�楠岄」鐩�
- * @param inspectionMaterialListId
+ * 鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
+ * @param id
* @return
*/
- int delInspectionProductList(int inspectionMaterialListId);
+ List<InspectionProductListDto> selectProductById(Integer id);
+
}
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 264093d..4ae79f0 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
@@ -3,7 +3,10 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+
import java.util.List;
import java.util.Map;
@@ -24,7 +27,7 @@
* @param state
* @return
*/
- Map selectAllPlan(int pageSize, int countSize, Integer state);
+ List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);
/**
* 鏍规嵁璁″垝id浣滃簾妫�楠岃鍒�
@@ -33,18 +36,13 @@
*/
boolean delPlan(Integer id);
- /**
- * 鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掗噷闈㈡楠岄」鐩�
- * @param id
- * @return
- */
- List<InspectionProductList> selectProductById(Integer id);
+
/**
* 缁欐楠岃鍒掍腑鐨勬楠岄」鐩垎閰嶈瘯楠屽憳,璁惧,浠ュ強鏃ユ湡
* @param inspectionProductList
*/
- void upPlan(InspectionProductList inspectionProductList);
+ void upPlan(InspectionProductListDto inspectionProductListDto);
/**
* 鏌ヨ鎴愬搧妫�楠�
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
index 58f207b..8cfa310 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
@@ -3,14 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
-import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
-import com.yuanchu.limslaboratory.mapper.PlanMapper;
-import com.yuanchu.limslaboratory.mapper.ProductMapper;
+import com.yuanchu.limslaboratory.mapper.*;
import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.PlanService;
+import com.yuanchu.limslaboratory.vo.Result;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,7 +19,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -39,8 +37,6 @@
@Resource
InspectionProductListService inspectionProductListService;
- @Resource
- InspectionProductListMapper inspectionProductListMapper;
//鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�
@Override
@@ -51,48 +47,47 @@
//娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�
@Override
@Transactional(rollbackFor = Exception.class)
- public InspectionMaterialList addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId) {
- int judge = inspectionMaterialListMapper.insert(inspectionMaterialList);
- List<Product> list = productMapper.selectProductByMaterialId(inspectionMaterialList.getMaterialId());
- List<InspectionProductList> list1 = new ArrayList<>();
- list.forEach(a-> {
- InspectionProductList inspectionProductList = new InspectionProductList();
- inspectionProductList.setName(a.getName())
- .setMethod(a.getMethod())
- .setUnit(a.getUnit())
- .setRequired(a.getRequired())
- .setInternal(a.getInternal())
- .setState(1)
- .setInspectionMaterialListId(inspectionMaterialList.getId())
- .setUserId(Integer.parseInt(userId));
- list1.add(inspectionProductList);
- });
- //娣诲姞妫�楠岄」鐩�
- int judge2 = inspectionProductListMapper.addInspectionProductList(list1);
- return judge>0&&judge2>0?inspectionMaterialList:null;
+ public void addInspectionMaterialList(InspectionMaterialList inspectionMaterialList, String userId) {
+ inspectionMaterialListMapper.insert(inspectionMaterialList);
+ List<Product> list = productMapper.selectProductByMaterialId(inspectionMaterialList.getMaterialId());
+ List<InspectionProductList> list1 = new ArrayList<>();
+ list.forEach(a -> {
+ InspectionProductList inspectionProductList = new InspectionProductList();
+ inspectionProductList.setName(a.getName())
+ .setMethod(a.getMethod())
+ .setUnit(a.getUnit())
+ .setRequired(a.getRequired())
+ .setInternal(a.getInternal())
+ .setState(1)
+ .setInspectionMaterialListId(inspectionMaterialList.getId())
+ .setUserId(Integer.parseInt(userId));
+ list1.add(inspectionProductList);
+ });
+ //娣诲姞妫�楠岄」鐩�
+ inspectionProductListService.saveBatch(list1);
}
//鏍规嵁鏍峰搧id鍒犻櫎妫�楠屾牱鍝�
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean delInspectionMaterialListByInsId(int inspectionMaterialListId) {
+ public void delInspectionMaterialListByInsId(int inspectionMaterialListId) {
//鍒犻櫎妫�楠屾牱鍝�
InspectionMaterialList list = new InspectionMaterialList();
list.setState(0);
list.setId(inspectionMaterialListId);
- int judge1 = inspectionMaterialListMapper.updateById(list);
+ inspectionMaterialListMapper.updateById(list);
//鏍规嵁鏍峰搧id鍒犻櫎妫�楠屾牱鍝佷腑鐨勬楠岄」鐩�
- int judge2 = inspectionProductListService.delInspectionProductList(inspectionMaterialListId);
- return judge1>0&&judge2>0;
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspection_material_list_id", inspectionMaterialListId).set("state", 0);
+ inspectionProductListService.update(new InspectionProductList(), wrapper);
}
//鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList) {
+ public void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialList inspectionMaterialList) {
LambdaUpdateWrapper<InspectionMaterialList> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(InspectionMaterialList::getId,inspectionMaterialListId);
- int judge = inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
- return judge>0;
+ updateWrapper.eq(InspectionMaterialList::getId, inspectionMaterialListId);
+ inspectionMaterialListMapper.update(inspectionMaterialList, updateWrapper);
}
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
index 988f939..bf88d1c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
@@ -1,9 +1,11 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -27,11 +29,11 @@
- //鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧閲岀殑妫�楠岄」鐩�
+ //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
@Override
- public int delInspectionProductList(int inspectionMaterialListId) {
- UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
- wrapper.eq("inspectionMaterialListId", inspectionMaterialListId).set("state", 0);
- return inspectionProductListMapper.update(new InspectionProductList(),wrapper);
+ public List<InspectionProductListDto> selectProductById(Integer id) {
+ return inspectionProductListMapper.selectByMaterId(id);
}
+
+
}
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 058dd0b..040aa26 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
@@ -3,22 +3,26 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
+import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.mapper.PlanMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
import com.yuanchu.limslaboratory.pojo.Plan;
import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.InspectionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -36,18 +40,21 @@
@Resource
InspectionMaterialListMapper inspectionMaterialListMapper;
+ @Resource
+ InspectionProductListMapper inspectionProductListMapper;
+
//娣诲姞妫�楠岀敵璇峰崟
@Override
- public Inspection addInspection(String userName,int type) {
- Inspection inspection = new Inspection(type, 0,1,1, userName);
+ public Inspection addInspection(String userName, int type) {
+ Inspection inspection = new Inspection(type, 0, 1, 1, userName);
int judge = inspectionMapper.insert(inspection);
- return judge>0?inspection:null;
+ return judge > 0 ? inspection : null;
}
//鏌ヨ鎵�鏈夋楠屽崟鍒楄〃
@Override
public List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state) {
- return inspectionMapper.selectAllInspection((pageSize - 1) * countSize,pageSize * countSize, state);
+ return inspectionMapper.selectAllInspection((pageSize - 1) * countSize, pageSize * countSize, state);
}
//浣滃簾鐢宠妫�楠屽崟
@@ -57,11 +64,18 @@
Inspection inspection = inspectionMapper.selectById(inspectionId);
inspection.setState(0);
int judge1 = inspectionMapper.updateById(inspection);
+ //妫�楠岃鍒掍綔搴�
+ UpdateWrapper<Plan> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("inspection_id", inspectionId).set("state", 0);
+ planMapper.update(new Plan(),updateWrapper );
//妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)
- UpdateWrapper<InspectionMaterialList> wrapper = new UpdateWrapper<>();
- wrapper.eq("inspection_id", inspectionId).set("state", 0);
- int judge2 = inspectionMaterialListMapper.update(new InspectionMaterialList(),wrapper);
- return judge1>0&&judge2>0;
+ UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
+ wrapper1.eq("inspection_id", inspectionId).set("state", 0);
+ int judge2 = inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
+ return judge1 > 0 && judge2 > 0;
+ //妫�楠屾牱鍝佷腑鐨勬楠岄」鐩綔搴�
+ //鏌ュ嚭妫�楠屾牱鍝乮d
+
}
//鎻愪氦鐢宠妫�楠屽崟
@@ -72,8 +86,8 @@
inspection.setState(2);
int judge = inspectionMapper.updateById(inspection);
//璁″垝琛ㄦ柊澧�
- Plan plan = Plan.builder().inspectionId(inspectionId).state(1).build();
+ Plan plan = Plan.builder().inspectionId(inspectionId).state(1).userId(inspection.getInspectUserId()).createTime(new Date()).build();
planMapper.insert(plan);
- return judge>0;
+ return judge > 0;
}
}
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 45da709..285a465 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,21 +1,25 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
-import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
-import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
-import com.yuanchu.limslaboratory.pojo.InspectionProductList;
-import com.yuanchu.limslaboratory.pojo.Plan;
-import com.yuanchu.limslaboratory.mapper.PlanMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yuanchu.limslaboratory.mapper.*;
+import com.yuanchu.limslaboratory.pojo.*;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.pojo.dto.PlanDto;
+import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import com.yuanchu.limslaboratory.service.PlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
+
/**
* <p>
@@ -34,9 +38,18 @@
@Resource
InspectionProductListMapper inspectionProductListMapper;
+ @Resource
+ InspectionMaterialListMapper inspectionMaterialListMapper;
+
+ @Resource
+ UserMapper userMapper;
+
+ @Resource
+ InstrumentMapper instrumentMapper;
+
//鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
@Override
- public Map selectAllPlan(int pageSize, int countSize, Integer state) {
+ public List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state) {
if (state == null) {
state = 2;
}
@@ -53,19 +66,39 @@
return judge > 0;
}
- //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掗噷闈㈢殑妫�楠岄」鐩�
+ //淇敼(鍒嗛厤)妫�楠岃鍒掗噷鍒嗛厤璁″垝鐨勪俊鎭�
@Override
- public List<InspectionProductList> selectProductById(Integer id) {
- return inspectionProductListMapper.selectByMaterId(id);
- }
+ public void upPlan(InspectionProductListDto inspectionProductListDto) {
+ /*鏇存柊璁″垝琛ㄤ腑鐨勭姸鎬�(3:宸插垎閰�),鏇存柊鏃堕棿*/
+ //鏌ヨ鎶ユ鍗昳d
+ InspectionMaterialList inspectionMaterialList = inspectionMaterialListMapper.selectById(inspectionProductListDto.getInspectionMaterialListId());
+ LambdaQueryWrapper<Plan> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Plan::getInspectionId, inspectionMaterialList.getInspectionId());
+ Plan plan = planMapper.selectOne(queryWrapper);
+ plan.setState(3).setUpdateTime(new Date());
+ //鏍规嵁鎶ユ鍗昳d杩涜鏇存柊璁″垝琛�
+ LambdaUpdateWrapper<Plan> updateWrapper1 = new LambdaUpdateWrapper<>();
+ updateWrapper1.eq(Plan::getInspectionId, plan.getInspectionId());
+ planMapper.update(plan, updateWrapper1);
- //淇敼妫�楠岃鍒掗噷鍒嗛厤璁″垝鐨勪俊鎭�
- @Override
- public void upPlan(InspectionProductList inspectionProductList) {
- LambdaUpdateWrapper<InspectionProductList> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
- .eq(InspectionProductList::getMethod, inspectionProductList.getMethod());
- inspectionProductListMapper.update(inspectionProductList, updateWrapper);
+ /*鏇存柊妫�楠岄」鐩〃涓殑椤圭洰妫�楠屽紑濮嬫棩鏈�,椤圭洰妫�楠岀粨鏉熸棩鏈�,椤圭洰璇曢獙鍛�,璇曢獙瑕佹眰,鏇存柊鏃堕棿,璁惧id*/
+ InspectionProductList inspectionProductList = new InspectionProductList();
+ //澶嶅埗涔嬪悗,inspectionProductList閲岄潰鏈夐」鐩楠屽紑濮嬨�佺粨鏉熸棩鏈�,椤圭洰鍚嶇О,璇曢獙鏂规硶,璇曢獙瑕佹眰,鍗曚綅,
+ BeanUtils.copyProperties(inspectionProductListDto, inspectionProductList);
+ //鏍规嵁璁惧鍚嶈幏鍙栬澶噄d
+ LambdaQueryWrapper<Instrument> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(Instrument::getEquipmentName, inspectionProductListDto.getInstrumentName());
+ Instrument instrument = instrumentMapper.selectOne(wrapper1);
+ //鏍规嵁鐢ㄦ埛鍚嶈幏鍙栫敤鎴穒d
+ LambdaQueryWrapper<User> wrapper2 = new LambdaQueryWrapper<>();
+ wrapper2.eq(User::getName, inspectionProductListDto.getUserName());
+ User user = userMapper.selectOne(wrapper2);
+ inspectionProductList.setUpdateTime(new Date()).setUserId(user.getId()).setInstrumentId(instrument.getId());
+ //鏍规嵁鎶ユ鏍峰搧id鍜岄」鐩悕绉拌繘琛屾洿鏂版楠岄」鐩〃
+ LambdaUpdateWrapper<InspectionProductList> updateWrapper2 = new LambdaUpdateWrapper<>();
+ updateWrapper2.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
+ .eq(InspectionProductList::getName, inspectionProductList.getName());
+ inspectionProductListMapper.update(inspectionProductList, updateWrapper2);
}
//鏌ヨ鎴愬搧妫�楠�
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index ed388bb..6a26177 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -1,19 +1,12 @@
<?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.InspectionProductListMapper">
- <insert id="addInspectionProductList">
- INSERT INTO inspection_product_list (name, method, ask, unit, required, internal, create_time,
- update_time,inspection_material_list_id, user_id) VALUES
- <foreach collection="list" separator="," item="i">
- (#{i.name}, #{i.method}, #{i.ask}, #{i.unit}, #{i.required}, #{i.internal}, #{i.createTime},
- #{i.updateTime}, #{i.inspectionMaterialListId},
- #{i.userId})
- </foreach>
- </insert>
- <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.InspectionProductList">
- select id,
- name,
+ <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto">
+ select inspection_material_list_id,
+ inspect_start_time inspectStartTime,
+ inspect_end_time inspectEndTime,
+ ipl.name,
method,
ask,
unit,
@@ -21,14 +14,13 @@
internal,
start_time,
end_time,
- state,
- create_time,
- update_time,
- version,
- inspection_material_list_id,
- user_id,
- instrument_id
- from lims_laboratory.inspection_product_list
+ user.name userName,
+ equipment_name instrumentName
+ from lims_laboratory.inspection_product_list ipl
+ join lims_laboratory.inspection_material_list iml on iml.id = ipl.inspection_material_list_id
+ join lims_laboratory.inspection i on i.id = iml.inspection_id
+ join lims_laboratory.user on ipl.user_id = user.id
+ join lims_laboratory.instrument on ipl.instrument_id = instrument.id
where inspection_material_list_id = #{id}
</select>
</mapper>
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index 8234fc3..32b9d04 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -1,12 +1,45 @@
<?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">
- <select id="selectAllPlan" resultType="Map">
- select p.id,results,p.state,p.create_time,p.inspection_id,user_id,results,type,user_name
- from lims_laboratory.plan p left join lims_laboratory.inspection i
- on i.id=p.inspection_id
+ <select id="selectAllPlan" resultType="com.yuanchu.limslaboratory.pojo.vo.PlanVo">
+ select mid ,
+ p.inspection_id ,
+ state ,
+ create_time ,
+ name ,
+ material_name ,
+ specifications_serial_number ,
+ material_id ,
+ material_supplier ,
+ start_time ,
+ end_time ,
+ results ,
+ material_location ,
+ method ,
+ material_batch ,
+ material_reel_number ,
+ material_num
+ from (select plan.user_id, plan.state, plan.create_time, plan.results, plan.inspection_id, name
+ from lims_laboratory.plan
+ join lims_laboratory.user u on plan.user_id = u.id) p
+ left join (select iml.id mid,
+ iml.specifications_serial_number,
+ iml.material_id,
+ iml.material_supplier,
+ ipl.start_time,
+ ipl.end_time,
+ iml.material_location,
+ iml.material_name,
+ ipl.method,
+ iml.material_batch,
+ iml.material_reel_number,
+ iml.material_num,
+ iml.inspection_id
+ from lims_laboratory.inspection_material_list iml
+ left join lims_laboratory.inspection_product_list ipl on iml.id = ipl.inspection_material_list_id) il
+ on p.inspection_id = il.inspection_id
<if test="state!=null">
- where p.state = #{state}
+ where state = #{state}
</if>
order by p.create_time desc
limit #{pageSize},#{countSize}
@@ -15,13 +48,13 @@
<select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.PlanDto">
select i.mid , p.inspection_id , p.state, p.create_time, p.name userName, i.name inspectUserName
from (select inspection_id, state, plan.create_time, name
- from lims_laboratory.plan
- left join lims_laboratory.user on plan.user_id = user.id) p
- left join (select inspection.id, name, iml.id mid
- from lims_laboratory.inspection
- left join lims_laboratory.user on user.id = inspection.inspect_user_id
- left join lims_laboratory.inspection_material_list iml on inspection.id = iml.inspection_id) i
- on p.inspection_id = i.id
+ from lims_laboratory.plan
+ left join lims_laboratory.user on plan.user_id = user.id) p
+ left join (select inspection.id, name, iml.id mid
+ from lims_laboratory.inspection
+ left join lims_laboratory.user on user.id = inspection.inspect_user_id
+ left join lims_laboratory.inspection_material_list iml on inspection.id = iml.inspection_id) i
+ on p.inspection_id = i.id
<if test="state!=null">
where p.state = #{state}
</if>
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 64b717a..cb7314b 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
import java.util.Map;
import java.util.Objects;
@@ -16,6 +17,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
+@Mapper
public interface InstrumentMapper extends BaseMapper<Instrument> {
IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
index 63a2e7e..36d3d43 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java
@@ -17,7 +17,7 @@
public interface MaterialMapper extends BaseMapper<Material> {
//鏌ヨ鐗╂枡淇℃伅
- List<Material> selectMaterialLimit(int num1,int num2);
+ List<Map> selectMaterialLimit(int num1,int num2);
//鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
Map selectMaterialById(String materialId);
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
index ebacb35..4dfb8f8 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -22,7 +22,7 @@
* @param countSize
* @return
*/
- List<Material> selectMaterialLimit(int pageSize,int countSize);
+ List<Map> selectMaterialLimit(int pageSize,int countSize);
Integer addMaterialInformation(Material material);
@@ -55,7 +55,7 @@
List<String> specificationsIdDeleteMaterial(List<Integer> deleteSpecificationsId);
/**
- * 鏍规嵁鐗╂枡id鏌ヨ鐗╂祦
+ * 鏍规嵁鐗╂枡id鏌ヨ鐗╂枡
* @param materialId
* @return
*/
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
index 26fa9a8..8f9be2b 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -37,7 +37,7 @@
//鏌ヨ鐗╂枡淇℃伅
@Override
- public List<Material> selectMaterialLimit(int pageSize, int countSize) {
+ public List<Map> selectMaterialLimit(int pageSize, int countSize) {
return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize);
}
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index a14fe8e..7f77634 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -2,14 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
- <select id="selectMaterialLimit" resultType="com.yuanchu.limslaboratory.pojo.Material">
+ <select id="selectMaterialLimit" resultType="Map">
select id, name
- from material
+ from lims_laboratory.material
where state = 1
order by create_time desc
limit #{num1},#{num2}
</select>
- <select id="selectMaterialById" resultType="java.util.Map">
+ <select id="selectMaterialById" resultType="Map">
select m.id,
m.num,
m.supplier,
@@ -22,10 +22,11 @@
s.cross_section crossSection,
s.number_of_cores numberOfCores,
s.instruct
- from material m,
- specifications s,
- serial_number sn
+ from lims_laboratory.material m,
+ lims_laboratory.specifications s,
+ lims_laboratory.serial_number sn
where m.specifications_id = s.id
and s.serial_id = sn.id
+ and m.id=#{materialId}
</select>
</mapper>
--
Gitblit v1.9.3