From 0e1722e96e5483d560eda8f1cf96282955d4f224 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 27 七月 2023 15:04:40 +0800
Subject: [PATCH] 检验模块
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java | 77 ++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java | 2
inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml | 30 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java | 1
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/UserMapper.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 12
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java | 7
inspection-server/src/main/resources/mapper/PlanMapper.xml | 2
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 5
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java | 5
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java | 3
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InstrumentServiceImpl.java | 7
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java | 77 ++++++++
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 2
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java | 7
standard-server/src/main/resources/mapper/ProductMapper.xml | 18 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java | 26 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 37 ++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java | 5
user-server/src/main/resources/mapper/UserMapper.xml | 17 -
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 16 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java | 2
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 52 +++--
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java | 5
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 37 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java | 40 ---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 7
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java | 8
37 files changed, 387 insertions(+), 152 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 d26e03c..0092abf 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
@@ -102,7 +102,8 @@
})
@PostMapping("/submitInspection")
public Result submitInspection(String inspectionId) {
- return Result.success(inspectionService.subInspectionByInsId(inspectionId));
+ inspectionService.subInspectionByInsId(inspectionId);
+ return Result.success();
}
@ApiOperation("浣滃簾妫�楠屽崟鐢宠")
@@ -111,6 +112,7 @@
})
@PostMapping("/delInspection")
public Result delInspection(String inspectionId) {
- return Result.success(inspectionService.delInspectionByInsId(inspectionId));
+ inspectionService.delInspectionByInsId(inspectionId);
+ return Result.success();
}
}
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 184292f..ccabfa0 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
@@ -4,6 +4,7 @@
import com.yuanchu.limslaboratory.mapper.InspectionMapper;
import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
import com.yuanchu.limslaboratory.service.InspectionMaterialListService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
@@ -78,8 +79,8 @@
@ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
})
@PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
- public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialList inspectionMaterialList) {
- inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialList);
+ public Result updateInspectionMaterialList(@PathVariable Integer inspectionMaterialListId, @RequestBody InspectionMaterialListDto inspectionMaterialListDto) {
+ inspectionMaterialListService.updateInspectionMaterialList(inspectionMaterialListId, inspectionMaterialListDto);
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 c3c2dfa..7002ef8 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,10 +1,8 @@
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.pojo.Instrument;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
+import com.yuanchu.limslaboratory.service.InstrumentService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -12,7 +10,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
-
import javax.annotation.Resource;
/**
@@ -32,6 +29,9 @@
UserService userService;
@Resource
+ InstrumentService instrumentService;
+
+ @Resource
InspectionProductListService inspectionProductListService;
@ApiOperation("鏌ヨ璇曢獙鍛樹俊鎭�")
@@ -49,6 +49,22 @@
return Result.success(userService.selectByUserId(id));
}
+ @ApiOperation("鏌ヨ璁惧淇℃伅")
+ @GetMapping("/selectInstrument")
+ public Result selectInstrument() {
+ return Result.success(instrumentService.selectInstrument());
+ }
+
+ @ApiOperation("閫夋嫨璁惧淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "璁惧ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/selectInstrumentById")
+ public Result selectInstrumentById(Integer id) {
+ Instrument instrument = instrumentService.getById(id);
+ return Result.success(instrument.getEquipmentName());
+ }
+
@ApiOperation("鏍规嵁妫�楠岃鍒掓牱鍝乮d鏌ヨ妫�楠岄」鐩�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鏍峰搧id", dataTypeClass = Integer.class, required = true)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
index a1391b5..2f0d707 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
@@ -47,8 +47,6 @@
return Result.success("淇敼鎴愬姛!");
}
-
-
/**
* 灏嗗緟鎻愪氦鐨勭殑妫�楠岄」鐩殑妫�娴嬭褰曠殑鐘舵�佽浆涓哄緟瀹℃牳
* @param 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 596848f..3d2fb9e 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,8 +2,11 @@
import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.yuanchu.limslaboratory.pojo.Instrument;
+import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
import com.yuanchu.limslaboratory.service.PlanService;
+import com.yuanchu.limslaboratory.service.ProductService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -29,6 +32,9 @@
@Resource
private PlanService planService;
+ @Resource
+ ProductService productService;
+
@ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -40,13 +46,31 @@
return Result.success(planService.selectAllPlan(pageSize, countSize, state));
}
- @ApiOperation("鍒嗛厤妫�楠岃鍒掍腑鍒嗛厤椤圭洰")
- @PostMapping("/upPlan")
- public Result upPlan(@RequestBody InspectionProductListDto inspectionProductListDto) {
- planService.upPlan(inspectionProductListDto);
- return Result.success();
+ @ApiOperation("鏍规嵁椤圭洰鍚嶆煡璇㈡墍鏈夎瘯楠屾柟娉�")
+ @GetMapping("/selectInstrumentByProname")
+ public Result selectInstrumentByProname(String name) {
+ return Result.success(productService.selectInstrumentByProname(name));
}
+ @ApiOperation("閫夋嫨璇曢獙鏂规硶")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "椤圭洰id", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/selectProMethodById")
+ public Result selectProMethodById(Integer id) {
+ Product product = productService.getById(id);
+ return Result.success(product.getMethod());
+ }
+
+ @ApiOperation("鍒嗛厤妫�楠岃鍒掍腑鍒嗛厤椤圭洰")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾牱鍝両D", dataTypeClass = Integer.class, required = true),
+ })
+ @PutMapping("/upPlan/{id}")
+ public Result upPlan(@PathVariable Integer id ,@RequestBody InspectionProductListDto inspectionProductListDto) {
+ planService.upPlan(id,inspectionProductListDto);
+ return Result.success();
+ }
@ApiOperation("浣滃簾妫�楠岃鍒�")
@ApiImplicitParams(value = {
@@ -54,7 +78,8 @@
})
@PutMapping("/delPlan/{id}")
public Result delPlan(@PathVariable Integer id) {
- return Result.success(planService.delPlan(id));
+ planService.delPlan(id);
+ return Result.success();
}
@ApiOperation("鏌ヨ鎴愬搧妫�楠�")
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
index 06632a5..6c8d8f7 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
@@ -15,7 +15,7 @@
*/
public interface InspectionMaterialListMapper extends BaseMapper<InspectionMaterialList> {
- //鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�
+ //鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�
List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId);
}
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 6d49844..1423320 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,5 +23,5 @@
//鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
- List<InspectionProductListDto> selectByMaterId(Integer id);
+ List<InspectionProductListVo> 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 e9e152c..c453761 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
@@ -2,11 +2,10 @@
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.FinPlanVo;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -22,5 +21,5 @@
List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);
//鏌ヨ鎴愬搧妫�楠�
- List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
+ List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state);
}
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 77fe3b8..1378035 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
@@ -3,7 +3,6 @@
import com.yuanchu.limslaboratory.pojo.Inspection;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
import java.io.Serializable;
@Data
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java
new file mode 100644
index 0000000..90f730e
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java
@@ -0,0 +1,77 @@
+package com.yuanchu.limslaboratory.pojo.dto;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+//淇敼鏍峰搧淇℃伅
+@Data
+public class InspectionMaterialListDto implements Serializable {
+
+
+ /**
+ * 鎶ユ鏁伴噺-鐗╂枡鏁伴噺
+ */
+ @ApiModelProperty(value = "鎶ユ鏁伴噺-鐗╂枡鏁伴噺",required = true)
+ private Integer materialNum;
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�",required = true)
+ private String materialSupplier;
+ /**
+ * 鐗╂枡鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О",required = true)
+ private String materialName;
+ /**
+ * 鐗╂枡瀛樻斁鍦�
+ */
+ @ApiModelProperty(value = "鐗╂枡瀛樻斁鍦�",required = true)
+ private String materialLocation;
+ /**
+ * 鐗╂枡鎵规
+ */
+ @ApiModelProperty(value = "鐗╂枡鎵规",required = true)
+ private String materialBatch;
+ /**
+ * 鐗╂枡鐩樺彿
+ */
+ @ApiModelProperty(value = "鐗╂枡鐩樺彿",required = true)
+ private String materialReelNumber;
+ /**
+ * 瑙勬牸鍚嶇О/鍨嬪彿鍚嶇О
+ */
+ @ApiModelProperty(value = "瑙勬牸鍚嶇О/鍨嬪彿鍚嶇О",required = true)
+ private String specificationsSerialNumber;
+ /**
+ * 鐢靛帇绛夌骇
+ */
+ @ApiModelProperty("鐢靛帇绛夌骇")
+ private String specificationsVoltageLevel;
+ /**
+ * 涓荤嚎蹇冩埅闈�
+ */
+ @ApiModelProperty("涓荤嚎蹇冩埅闈�")
+ private String specificationsCrossSection;
+ /**
+ * 涓荤嚎鑺姱鏁�
+ */
+ @ApiModelProperty("涓荤嚎鑺姱鏁�")
+ private String specificationsNumberOfCores;
+ /**
+ * 鐢熶骇鎸囦护鍙�
+ */
+ @ApiModelProperty("鐢熶骇鎸囦护鍙�")
+ private String specificationsInstruct;
+
+ @ApiModelProperty("澶囨敞")
+ private String notes;
+
+
+
+
+}
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
index 64196c9..8f5ccfa 100644
--- 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
@@ -1,36 +1,19 @@
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")
@@ -64,19 +47,12 @@
@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 = "妫�楠岄」鐩瘯楠屽憳")
+ @ApiModelProperty(value = "鍏宠仈妫�楠岄」鐩瘯楠屽憳id")
@JsonSerialize
- private String userName;
+ private Integer userId;
- @ApiModelProperty(value = "鍏宠仈 璁惧鍚�")
+ @ApiModelProperty(value = "鍏宠仈 璁惧id")
@JsonSerialize
- private String instrumentName;
+ private Integer instrumentId;
}
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 5c52ad7..bf3ab30 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
@@ -8,6 +8,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+//(淇敼)(鏌ヨ)妫�娴嬭褰�
@Data
public class InspectionRecordsDto implements Serializable {
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/vo/FinPlanVo.java
similarity index 89%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
rename to inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java
index 624f9d7..b90fd31 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/PlanDto.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java
@@ -1,4 +1,4 @@
-package com.yuanchu.limslaboratory.pojo.dto;
+package com.yuanchu.limslaboratory.pojo.vo;
import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -7,16 +7,15 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
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 {
+public class FinPlanVo implements Serializable {
@ApiModelProperty(value = "璁″垝缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java
new file mode 100644
index 0000000..d76aae2
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java
@@ -0,0 +1,77 @@
+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.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-17
+ */
+//鏌ヨ妫�楠岄」鐩�
+@Data
+public class InspectionProductListVo 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/vo/PlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
index 4a6d592..e68fea1 100644
--- 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
@@ -12,7 +12,7 @@
import java.io.Serializable;
import java.util.Date;
-//妫�楠岃鍒掑垎閰�
+//(鍒嗛〉鏌ヨ)妫�楠岃鍒掑垎閰�
@Data
public class PlanVo implements Serializable {
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 88f38bc..8a022fd 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
import com.yuanchu.limslaboratory.pojo.Plan;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
import java.util.List;
@@ -41,8 +42,8 @@
/**
*鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
* @param inspectionMaterialListId
- * @param inspectionMaterialList
+ * @param inspectionMaterialListDto
* @return
*/
- void updateInspectionMaterialList( Integer inspectionMaterialListId,InspectionMaterialList inspectionMaterialList);
+ void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialListDto inspectionMaterialListDto);
}
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 1c9ff86..7b792f4 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import java.util.List;
@@ -18,14 +19,11 @@
public interface InspectionProductListService extends IService<InspectionProductList> {
-
-
/**
* 鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
* @param id
* @return
*/
- List<InspectionProductListDto> selectProductById(Integer id);
-
+ List<InspectionProductListVo> selectProductById(Integer id);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
index 71e4486..7c17380 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
@@ -39,13 +39,13 @@
* @param inspectionId
* @return
*/
- boolean delInspectionByInsId(String inspectionId);
+ void delInspectionByInsId(String inspectionId);
/**
* 鏍规嵁妫�楠屽崟id鎻愪氦妫�楠岀敵璇�
* @param inspectionId
* @return
*/
- boolean subInspectionByInsId(String inspectionId);
+ void subInspectionByInsId(String inspectionId);
}
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 4ae79f0..397c3f9 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,14 +1,12 @@
package com.yuanchu.limslaboratory.service;
-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.FinPlanVo;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -34,15 +32,15 @@
* @param id
* @return
*/
- boolean delPlan(Integer id);
+ void delPlan(Integer id);
/**
* 缁欐楠岃鍒掍腑鐨勬楠岄」鐩垎閰嶈瘯楠屽憳,璁惧,浠ュ強鏃ユ湡
- * @param inspectionProductList
+ * @param inspectionProductListDto
*/
- void upPlan(InspectionProductListDto inspectionProductListDto);
+ void upPlan(Integer id ,InspectionProductListDto inspectionProductListDto);
/**
* 鏌ヨ鎴愬搧妫�楠�
@@ -51,5 +49,5 @@
* @param state
* @return
*/
- List<PlanDto> selectInspection(int pageSize, int countSize, Integer state);
+ List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state);
}
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 8cfa310..3ffd6f1 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
@@ -5,10 +5,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.mapper.*;
import com.yuanchu.limslaboratory.pojo.*;
+import com.yuanchu.limslaboratory.pojo.dto.InspectionMaterialListDto;
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.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -38,7 +40,7 @@
InspectionProductListService inspectionProductListService;
- //鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�
+ //鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�
@Override
public List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId) {
return inspectionMaterialListMapper.selectInspectionMaterialListByInsId(insId);
@@ -85,7 +87,9 @@
//鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialList inspectionMaterialList) {
+ public void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialListDto inspectionMaterialListDto) {
+ InspectionMaterialList inspectionMaterialList = new InspectionMaterialList();
+ BeanUtils.copyProperties(inspectionMaterialListDto,inspectionMaterialList);
LambdaUpdateWrapper<InspectionMaterialList> updateWrapper = new LambdaUpdateWrapper<>();
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 bf88d1c..e34d36e 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
@@ -6,6 +6,7 @@
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@@ -31,7 +32,7 @@
//鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
@Override
- public List<InspectionProductListDto> selectProductById(Integer id) {
+ public List<InspectionProductListVo> 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 040aa26..ebfb650 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
@@ -1,7 +1,10 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper;
import com.yuanchu.limslaboratory.mapper.InspectionProductListMapper;
import com.yuanchu.limslaboratory.mapper.PlanMapper;
@@ -15,6 +18,7 @@
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;
@@ -41,7 +45,7 @@
InspectionMaterialListMapper inspectionMaterialListMapper;
@Resource
- InspectionProductListMapper inspectionProductListMapper;
+ InspectionProductListService inspectionProductListService;
//娣诲姞妫�楠岀敵璇峰崟
@Override
@@ -59,35 +63,40 @@
//浣滃簾鐢宠妫�楠屽崟
@Override
- public boolean delInspectionByInsId(String inspectionId) {
- //妫�楠屽崟浣滃簾
+ public void delInspectionByInsId(String inspectionId) {
+ /*妫�楠屽崟浣滃簾*/
Inspection inspection = inspectionMapper.selectById(inspectionId);
inspection.setState(0);
- int judge1 = inspectionMapper.updateById(inspection);
- //妫�楠岃鍒掍綔搴�
+ inspectionMapper.updateById(inspection);
+ /*妫�楠岃鍒掍綔搴�*/
UpdateWrapper<Plan> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("inspection_id", inspectionId).set("state", 0);
- planMapper.update(new Plan(),updateWrapper );
- //妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)
+ planMapper.update(new Plan(), updateWrapper);
+ /*妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)*/
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;
- //妫�楠屾牱鍝佷腑鐨勬楠岄」鐩綔搴�
+ inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
+ /*妫�楠屾牱鍝佷腑鐨勬楠岄」鐩綔搴�*/
//鏌ュ嚭妫�楠屾牱鍝乮d
-
+ LambdaQueryWrapper<InspectionMaterialList> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(InspectionMaterialList::getInspectionId,inspectionId);
+ List<InspectionMaterialList> inspectionMaterialLists = inspectionMaterialListMapper.selectList(queryWrapper);
+ for (InspectionMaterialList inspectionMaterialList : inspectionMaterialLists) {
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspection_material_list_id", inspectionMaterialList.getId()).set("state", 0);
+ inspectionProductListService.update(new InspectionProductList(), wrapper);
+ }
}
//鎻愪氦鐢宠妫�楠屽崟
@Override
- public boolean subInspectionByInsId(String inspectionId) {
+ public void subInspectionByInsId(String inspectionId) {
Inspection inspection = inspectionMapper.selectById(inspectionId);
//鐘舵�佹敼涓哄凡鎻愪氦2
inspection.setState(2);
- int judge = inspectionMapper.updateById(inspection);
+ inspectionMapper.updateById(inspection);
//璁″垝琛ㄦ柊澧�
Plan plan = Plan.builder().inspectionId(inspectionId).state(1).userId(inspection.getInspectUserId()).createTime(new Date()).build();
planMapper.insert(plan);
- 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 285a465..ef612f3 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,16 +1,15 @@
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.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.FinPlanVo;
import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+import com.yuanchu.limslaboratory.service.InspectionProductListService;
import com.yuanchu.limslaboratory.service.PlanService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -42,10 +41,7 @@
InspectionMaterialListMapper inspectionMaterialListMapper;
@Resource
- UserMapper userMapper;
-
- @Resource
- InstrumentMapper instrumentMapper;
+ InspectionProductListService inspectionProductListService;
//鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
@Override
@@ -58,20 +54,37 @@
//浣滃簾妫�楠岃鍒�
@Override
- public boolean delPlan(Integer id) {
+ public void delPlan(Integer id) {
Plan plan = planMapper.selectById(id);
+
+ /*妫�楠岃鍒掍綔搴�*/
//鐘舵�佹敼涓轰綔搴�0
plan.setState(0);
- int judge = planMapper.updateById(plan);
- return judge > 0;
+ planMapper.updateById(plan);
+
+ /*妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)*/
+ UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
+ wrapper1.eq("inspection_id", plan.getInspectionId()).set("state", 0);
+ inspectionMaterialListMapper.update(new InspectionMaterialList(), wrapper1);
+
+ /*妫�楠屾牱鍝佷腑鐨勬楠岄」鐩綔搴�*/
+ //鏌ュ嚭妫�楠屾牱鍝乮d
+ LambdaQueryWrapper<InspectionMaterialList> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(InspectionMaterialList::getInspectionId, plan.getInspectionId());
+ List<InspectionMaterialList> inspectionMaterialLists = inspectionMaterialListMapper.selectList(queryWrapper);
+ for (InspectionMaterialList inspectionMaterialList : inspectionMaterialLists) {
+ UpdateWrapper<InspectionProductList> wrapper = new UpdateWrapper<>();
+ wrapper.eq("inspection_material_list_id", inspectionMaterialList.getId()).set("state", 0);
+ inspectionProductListService.update(new InspectionProductList(), wrapper);
+ }
}
//淇敼(鍒嗛厤)妫�楠岃鍒掗噷鍒嗛厤璁″垝鐨勪俊鎭�
@Override
- public void upPlan(InspectionProductListDto inspectionProductListDto) {
+ public void upPlan(Integer id, InspectionProductListDto inspectionProductListDto) {
/*鏇存柊璁″垝琛ㄤ腑鐨勭姸鎬�(3:宸插垎閰�),鏇存柊鏃堕棿*/
//鏌ヨ鎶ユ鍗昳d
- InspectionMaterialList inspectionMaterialList = inspectionMaterialListMapper.selectById(inspectionProductListDto.getInspectionMaterialListId());
+ InspectionMaterialList inspectionMaterialList = inspectionMaterialListMapper.selectById(id);
LambdaQueryWrapper<Plan> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Plan::getInspectionId, inspectionMaterialList.getInspectionId());
Plan plan = planMapper.selectOne(queryWrapper);
@@ -83,17 +96,8 @@
/*鏇存柊妫�楠岄」鐩〃涓殑椤圭洰妫�楠屽紑濮嬫棩鏈�,椤圭洰妫�楠岀粨鏉熸棩鏈�,椤圭洰璇曢獙鍛�,璇曢獙瑕佹眰,鏇存柊鏃堕棿,璁惧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());
+ inspectionProductList.setInspectionMaterialListId(id);
//鏍规嵁鎶ユ鏍峰搧id鍜岄」鐩悕绉拌繘琛屾洿鏂版楠岄」鐩〃
LambdaUpdateWrapper<InspectionProductList> updateWrapper2 = new LambdaUpdateWrapper<>();
updateWrapper2.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
@@ -103,7 +107,7 @@
//鏌ヨ鎴愬搧妫�楠�
@Override
- public List<PlanDto> selectInspection(int pageSize, int countSize, Integer state) {
+ public List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state) {
return planMapper.selectInspection((pageSize - 1) * countSize, pageSize * countSize, state);
}
}
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
index 6a26177..1eed103 100644
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
@@ -2,7 +2,7 @@
<!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">
- <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionProductListDto">
+ <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo">
select inspection_material_list_id,
inspect_start_time inspectStartTime,
inspect_end_time inspectEndTime,
@@ -14,13 +14,27 @@
internal,
start_time,
end_time,
- user.name userName,
+ uname 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}
+ from (select inspection_material_list_id,
+ pl.name name,
+ user.name uname,
+ method,
+ ask,
+ unit,
+ required,
+ internal,
+ start_time,
+ end_time,
+ equipment_name
+ from lims_laboratory.inspection_product_list pl
+ left join lims_laboratory.user on pl.user_id = user.id
+ left join lims_laboratory.instrument on pl.instrument_id = instrument.id) ipl
+ , lims_laboratory.inspection_material_list iml
+ , lims_laboratory.inspection i
+ where iml.id = ipl.inspection_material_list_id
+ and iml.id = ipl.inspection_material_list_id
+ and i.id = iml.inspection_id
+ and ipl.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 32b9d04..788786a 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -45,7 +45,7 @@
limit #{pageSize},#{countSize}
</select>
- <select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.PlanDto">
+ <select id="selectInspection" resultType="com.yuanchu.limslaboratory.pojo.vo.FinPlanVo">
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
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 cb7314b..711a7be 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -21,4 +22,8 @@
public interface InstrumentMapper extends BaseMapper<Instrument> {
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 9d492b5..14f5c05 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
@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -33,4 +34,10 @@
Instrument getIdInstrumentInformation(Integer instrumentId);
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 fc776d2..5e91307 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
@@ -13,6 +13,7 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -79,4 +80,10 @@
}
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 ccf1794..ee31f57 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -19,4 +19,7 @@
</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/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
index 3a02fc6..43f89ea 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -20,4 +20,7 @@
List<Product> selectProductByMaterialId(String materialId);
Map<String, Object> getProductInformation(Integer productId);
+
+ //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ List<Map> selectInstrumentByProname(String name);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
index 66bb330..8c4ddc8 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -31,4 +31,11 @@
void MaterialIdDeleteProduct(List<String> deleteMaterialId);
Integer updateMaterialInformation(Product product);
+
+ /**
+ * 閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ * @param name
+ * @return
+ */
+ List<Map> selectInstrumentByProname(String name);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index 11ff370..93d4b27 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -18,7 +18,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -50,8 +50,8 @@
wrapper.select(Product::getId, Product::getName, Product::getFather);
wrapper.groupBy(Product::getFather);
List<Map<String, Object>> products = productMapper.selectMaps(wrapper);
- for (Map<String, Object> product:products){
- if (!ObjectUtils.isEmpty(product.get("father"))){
+ for (Map<String, Object> product : products) {
+ if (!ObjectUtils.isEmpty(product.get("father"))) {
product.remove("name");
product.remove("id");
LambdaQueryWrapper<Product> wrapper1 = new LambdaQueryWrapper<>();
@@ -61,7 +61,7 @@
product.put("sonProduct", maps);
}
}
- for (Map<String, Object> product:products){
+ for (Map<String, Object> product : products) {
System.out.println(product);
}
return products;
@@ -86,7 +86,7 @@
@Override
public void MaterialIdDeleteProduct(List<String> deleteMaterialId) {
- for (String materialId : deleteMaterialId){
+ for (String materialId : deleteMaterialId) {
LambdaUpdateWrapper<Product> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(Product::getMaterialId, materialId);
wrapper.set(Product::getState, 0);
@@ -100,4 +100,10 @@
updateWrapper.eq(Product::getId, product.getId());
return productMapper.update(product, updateWrapper);
}
+
+ //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ @Override
+ public List<Map> selectInstrumentByProname(String name) {
+ return productMapper.selectInstrumentByProname(name);
+ }
}
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index ff7ffbb..b343c53 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -1,17 +1,27 @@
<?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.ProductMapper">
- <select id="selectProductByMaterialId" resultType="Product">
+ <select id="selectProductByMaterialId" resultType="com.yuanchu.limslaboratory.pojo.Product">
select id, name, method, father, unit, required, internal
from product
where material_id = #{material_id}
- and state = 1
+ and state = 1
</select>
<select id="getProductInformation" parameterType="integer" resultType="map">
- SELECT p.method, ifnull(null, p.father) projectClassification, p.user_id, date_format(p.update_time, '%Y-%m-%d %H:%i:%s') updateTime,
- p.unit, p.required, p.internal
+ SELECT p.method,
+ ifnull(null, p.father) projectClassification,
+ p.user_id,
+ date_format(p.update_time, '%Y-%m-%d %H:%i:%s') updateTime,
+ p.unit,
+ p.required,
+ p.internal
FROM product p
where p.id = #{productId}
</select>
+ <select id="selectInstrumentByProname" resultType="java.util.Map">
+ select id, method
+ from lims_laboratory.product
+ where name=#{name}
+ </select>
</mapper>
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 d0623da..232f21d 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,5 @@
IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
- List<User> selectUser();
+ List<Map> 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 3b9df69..d9b2a6d 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
@@ -79,5 +79,5 @@
* 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
* @return
*/
- List<User> selectUser();
+ List<Map> selectUser();
}
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 eb7b820..2bbd242 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<User> selectUser() {
+ public List<Map> selectUser() {
return userMapper.selectUser();
}
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index d5d6190..54ecc0e 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -37,21 +37,8 @@
</if>
</select>
- <select id="selectUser" resultType="com.yuanchu.limslaboratory.pojo.User">
- select id,
- account,
- password,
- name,
- phone,
- email,
- age,
- job_state,
- info,
- create_time,
- update_time,
- version,
- role_id,
- enterprise_id
+ <select id="selectUser" resultType="Map">
+ select id, name
from lims_laboratory.user
</select>
</mapper>
--
Gitblit v1.9.3