From 8f6ffe3ec5691fe2eb1ab6caf49748ff94d8e0fb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 07 八月 2023 08:58:51 +0800
Subject: [PATCH] 检验单
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java | 76 ++
inspection-server/src/main/resources/mapper/RawMaterialMapper.xml | 15
sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java | 4
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 1
standard-server/src/main/resources/mapper/MaterialMapper.xml | 22
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 38
inspection-server/src/main/resources/mapper/InspectionMaterialMapper.xml | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java | 15
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java | 15
inspection-server/src/main/resources/mapper/InspectionProductMapper.xml | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialMapper.java | 15
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectDetailVo.java | 94 +++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 1
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java | 23
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 6
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java | 15
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java | 15
laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java | 1
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java | 10
inspection-server/pom.xml | 5
standard-server/src/main/resources/mapper/ProductMapper.xml | 9
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialController.java | 38 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 169 +++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialService.java | 15
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductController.java | 84 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java | 100 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 25
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 52
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 231 +++++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java | 97 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java | 90 +++
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java | 1
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 2
/dev/null | 64 --
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 3
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java | 6
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 29 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java | 23
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java | 4
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialServiceImpl.java | 19
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 108 ++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java | 66 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 49 +
standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Standard.java | 4
45 files changed, 1,321 insertions(+), 352 deletions(-)
diff --git a/inspection-server/pom.xml b/inspection-server/pom.xml
index c78f93f..8a07947 100644
--- a/inspection-server/pom.xml
+++ b/inspection-server/pom.xml
@@ -32,5 +32,10 @@
<artifactId>laboratory-server</artifactId>
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
+ <version>5.8.12</version>
+ </dependency>
</dependencies>
</project>
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 f13bb17..dd191cd 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
@@ -1,36 +1,35 @@
package com.yuanchu.limslaboratory.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import java.text.ParseException;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.yuanchu.limslaboratory.pojo.Inspection;
-import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
-import com.yuanchu.limslaboratory.pojo.InspectionProductList;
-import com.yuanchu.limslaboratory.pojo.Product;
-import com.yuanchu.limslaboratory.service.*;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
+import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.service.InspectionService;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
+ * 鐢宠琛�(Inspection)琛ㄦ帶鍒跺眰
*
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:03:36
*/
-@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟")
+@Api(tags = "璇曢獙绠＄悊-->妫�楠岀敵璇�")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
@@ -38,83 +37,103 @@
@Autowired
private InspectionService inspectionService;
- @Autowired
- private InspectionMaterialListService inspectionMaterialListService;
+ @Resource
+ RawMaterialService rawMaterialService;
- @Autowired
- private InspectionProductListService inspectionProductListService;
+ @Resource
+ LinkBasicInformationService linkBasicInformationService;
- @Autowired
- private MaterialService materialService;
-
- @ApiOperation("娣诲姞妫�楠岀敵璇峰崟")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�", dataTypeClass = Integer.class, required = true),
- })
- @PostMapping("/addInspection")
- public Result addInspection(@RequestHeader("X-Token") String token, int type) throws Exception {
- Object object = RedisUtil.get(token);
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- return Result.success(inspectionService.addInspection("" + unmarshal.get("name"), type));
- }
-
- @ApiOperation("鏌ヨ鎵�鏈夋楠屽崟鍒楄〃")
+ @ApiOperation(value = "鏌ヨ妫�楠岀敵璇峰崟鍒楄〃")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "state", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "message", value = "鐢宠鍗曞彿/鍘熸潗鏂欏悕绉�", dataTypeClass = String.class)
})
- @GetMapping("/selectAllInspection")
- public Result selectAllInspection(int pageSize, int countSize, Integer state) {
- return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
+ @GetMapping("/selectInspectsList")
+ public Result selectInspectsList(int pageSize, int countSize, String message) {
+ IPage<Map<String, Object>> inspectionPage = inspectionService.selectInspectsList(new Page<Object>(pageSize, countSize), message);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", inspectionPage.getTotal());
+ map.put("row", inspectionPage.getRecords());
+ return Result.success(map);
}
- @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionId", value = "鎶ユ鍗旾D", dataTypeClass = String.class, required = true),
- })
- @PostMapping("/selectMaterialByInsId")
- public Result selectMaterialByInsId(String inspectionId) {
- return Result.success(inspectionMaterialListService.selectInspectionMaterialListByInsId(inspectionId));
- }
- @ApiOperation("鏌ヨ鐗╂枡淇℃伅")
+ @ApiOperation(value = "鏌ヨ鎵�鏈夋姤妫�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class, required = true)
})
- @GetMapping("/selectMaterialLimit")
- public Result selectMaterialLimit(int pageSize, int countSize, int type) {
- return Result.success(materialService.selectMaterialLimit(pageSize, countSize, type));
+ @GetMapping("/selectAll")
+ public Result selectAll(Integer type) {
+ switch (type) {
+ case 0 :
+ //鍘熸潗鏂�
+ return Result.success(rawMaterialService.selectRawmaAll());
+ case 1 :
+ //濮旀墭鍗�
+ return Result.success(linkBasicInformationService.selectLinkAll());
+ case 2 :
+ //鎴愬搧妫�楠�
+ return Result.success("璇疯緭鍏ユ楠屼俊鎭�!");
+ }
+ return Result.fail("绫诲瀷閿欒!");
}
- @ApiOperation("閫夋嫨鐗╂枡淇℃伅")
+
+ @ApiOperation(value = "閫夋嫨鍘熸潗鏂欐姤妫�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "materialId", value = "鐗╂枡ID", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "id", value = "鍘熸潗鏂欐姤妫�鍗昳d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true)
})
- @PostMapping("/selectMaterialById")
- public Result selectMaterialById(String materialId) {
- return Result.success(materialService.selectMaterialById(materialId));
+ @GetMapping("/selectRawmaById")
+ public Result selectRawmaById(Integer id, String startTime, String endTime) throws ParseException {
+ return Result.success(rawMaterialService.selectRawmaById(id,startTime,endTime));
}
- @ApiOperation("鎻愪氦妫�楠屽崟鐢宠")
+
+ @ApiOperation(value = "閫夋嫨濮旀墭鎶ユ鍜屾牱鍝�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "bid", value = "濮旀墭鎶ユ鍗昳d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "did", value = "濮旀墭鎶ユ鏍峰搧id", dataTypeClass = Integer.class, required = true)
})
- @PostMapping("/submitInspection")
- public Result submitInspection(String inspectionId) {
- inspectionService.subInspectionByInsId(inspectionId);
- return Result.success();
+ @GetMapping("/selectLinkByid")
+ public Result selectLinkByid(Integer bid, Integer did) {
+ return Result.success(linkBasicInformationService.selectLinkByid(bid, did));
}
- @ApiOperation("浣滃簾妫�楠屽崟鐢宠")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
- })
- @PostMapping("/delInspection")
- public Result delInspection(String inspectionId) {
- inspectionService.delInspectionByInsId(inspectionId);
- return Result.success();
+
+ @ApiOperation(value = "鏂板妫�楠屽崟")
+ @PostMapping("/addInspect")
+ public Result addInspect(@RequestHeader("token") String token, @RequestBody InspectionVo inspectionVo) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
}
+
+ @ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectInspectsListById")
+ public Result selectInspectsListById(Integer id) {
+ return Result.success(inspectionService.selectInspectsListById(id));
+ }
+
+ @ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/updateInspectsById")
+ public Result updateInspectsById(Integer id) {
+ //濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
+ Inspection inspection = inspectionService.getById(id);
+ if (ObjectUtils.isNotEmpty(inspection.getInspectionStatus())) {
+ return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
+ }
+ return Result.success(inspectionService.updateInspectsById(id));
+ }
+
+
}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialController.java
new file mode 100644
index 0000000..7388de8
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialController.java
@@ -0,0 +1,38 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+
+import java.util.List;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.service.InspectionMaterialService;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * (鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂�(InspectionMaterial)琛ㄦ帶鍒跺眰
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:28
+ */
+@Api(tags = "(鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂欐帴鍙�")
+@RestController
+@RequestMapping("/inspectionMaterial")
+public class InspectionMaterialController {
+
+ @Autowired
+ private InspectionMaterialService inspectionMaterialService;
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
deleted file mode 100644
index 0a2467c..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionMaterialListController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-
-import com.yuanchu.limslaboratory.mapper.InspectionMapper;
-import com.yuanchu.limslaboratory.pojo.Inspection;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-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;
-import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟-->鏍峰搧鐩稿叧")
-@RestController
-@RequestMapping("/inspectionMaterialList")
-public class InspectionMaterialListController {
-
- @Autowired
- InspectionMaterialListService inspectionMaterialListService;
-
- @Resource
- InspectionMapper inspectionMapper;
-
- @ApiOperation("娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�")
- @PostMapping("/addInspectionMaterialList")
- public Result addInspectionMaterialList(@RequestHeader("X-Token") String token, @RequestBody InspectionMaterialList inspectionMaterialList) throws Exception {
- //濡傛灉妫�楠屽崟宸蹭綔搴�,鐘舵�佷负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("鍒犻櫎鏍峰搧")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
- })
- @PostMapping("/delInspectionMaterialList")
- public Result delInspectionMaterialList(int inspectionMaterialListId) {
- inspectionMaterialListService.delInspectionMaterialListByInsId(inspectionMaterialListId);
- return Result.success();
- }
-
- @ApiOperation("鏍规嵁鏍峰搧Id鏌ヨ鏍峰搧淇℃伅")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionId", value = "鏍峰搧ID", dataTypeClass = String.class, required = true),
- })
- @GetMapping("/selectInspectionMaterialListById/{inspectionId}")
- public Result selectInspectionMaterialListById(@PathVariable String inspectionId) {
- return Result.success(inspectionMaterialListService.list(new QueryWrapper<InspectionMaterialList>().eq("inspection_id", inspectionId).eq("state", 1)));
- }
-
- @ApiOperation("鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "inspectionMaterialListId", value = "鏍峰搧ID", dataTypeClass = Integer.class, required = true),
- })
- @PutMapping("/updateInspectionMaterialList/{inspectionMaterialListId}")
- 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/InspectionProductController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductController.java
new file mode 100644
index 0000000..1ceff0c
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductController.java
@@ -0,0 +1,84 @@
+package com.yuanchu.limslaboratory.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+
+import java.util.List;
+
+import com.yuanchu.limslaboratory.pojo.InspectionProduct;
+import com.yuanchu.limslaboratory.pojo.vo.InsProductVo;
+import com.yuanchu.limslaboratory.service.InstrumentService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.service.InspectionProductService;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鐢宠鍗曚笅鐗╂枡涓殑椤圭洰(InspectionProduct)琛ㄦ帶鍒跺眰
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:54
+ */
+@Api(tags = "璇曢獙绠＄悊-->妫�楠岀敵璇�-->妫�楠岄」鐩�")
+@RestController
+@RequestMapping("/inspectionProduct")
+public class InspectionProductController {
+
+ @Autowired
+ private InspectionProductService inspectionProductService;
+
+ @Resource
+ InstrumentService instrumentService;
+
+ @ApiOperation(value = "鏌ヨ鎵�鏈夎澶�")
+ @GetMapping("/selectInstrument")
+ public Result selectInstrument() {
+ return Result.success(instrumentService.selectInstrument());
+ }
+
+ @ApiOperation("閫夋嫨璁惧淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "璁惧ID", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectInstrumentById")
+ public Result selectInstrumentById(Integer id) {
+ String equipmentName = instrumentService.getById(id).getEquipmentName();
+ return Result.success(equipmentName);
+ }
+
+
+ @ApiOperation(value = "鏇存柊妫�楠岄」鐩�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "testValue", value = "妫�娴嬪��", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "required", value = "鏍囧噯鍊�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "internal", value = "鍐呮帶鍊�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "name", value = "椤圭洰鍚嶇О", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "inspectionMaterialId", value = "鍐呮帶鍊�", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/updateInsProduct")
+ public Result updateInsProduct(@RequestHeader("token") String token, @RequestBody InspectionProduct inspectionProduct) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ Integer userId = (Integer) unmarshal.get("id");
+ return Result.success(inspectionProductService.updateInsProduct(userId,inspectionProduct));
+ }
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
deleted file mode 100644
index 7002ef8..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionProductListController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-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;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-@Api(tags = "妫�楠屾ā鍧�-->妫�楠屾牱鍝�-->妫�楠岄」鐩�")
-@RestController
-@RequestMapping("/inspection-product-list")
-public class InspectionProductListController {
-
- @Resource
- UserService userService;
-
- @Resource
- InstrumentService instrumentService;
-
- @Resource
- InspectionProductListService inspectionProductListService;
-
- @ApiOperation("鏌ヨ璇曢獙鍛樹俊鎭�")
- @GetMapping("/selectUser")
- public Result selectUser() {
- return Result.success(userService.selectUser());
- }
-
- @ApiOperation("閫夋嫨璇曢獙鍛樹俊鎭�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鐢ㄦ埛ID", dataTypeClass = Integer.class, required = true),
- })
- @PostMapping("/selectUserById")
- public Result selectUserById(Integer id) {
- 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)
- })
- @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/InspectionRecordsController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
deleted file mode 100644
index 2f0d707..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionRecordsController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-
-import com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto;
-import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import com.yuanchu.limslaboratory.service.InspectionRecordsService;
-
-
-
-/**
- * 妫�娴嬭褰�(InspectionRecords)琛ㄦ帶鍒跺眰
- *
- * @author zss
- * @since 2023-07-24 14:05:11
- */
-@Api(tags = "妫�楠屾ā鍧�-->妫�娴嬭褰�")
-@RestController
-@RequestMapping("/inspectionRecords")
-@Slf4j
-public class InspectionRecordsController {
-
- @Autowired
- private InspectionRecordsService inspectionRecordsService;
-
-
- @ApiOperation("鏍规嵁鏍峰搧鐨勯」鐩甶d浠ュ強鐘舵��(寰呮彁浜�)鏌ヨ妫�娴嬭褰�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "productId", value = "鏍峰搧涓嬬殑椤圭洰ID", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "submitState", value = "鐘舵��(涓虹┖=寰呮彁浜�)", dataTypeClass = Integer.class)
- })
- @GetMapping("/selectByProductId/{productId}")
- public Result selectByProductId(@PathVariable Integer productId, Integer submitState) {
- return Result.success(inspectionRecordsService.selectByProductId(productId,submitState));
- }
-
- @ApiOperation("鏍规嵁鏍峰搧鐨勯」鐩甶d浠ュ強鐘舵��(寰呮彁浜�)淇敼妫�娴嬭褰�")
- @PutMapping("/upByProductId")
- public Result upByProductId(@RequestBody InspectionRecordsDto inspectionRecordsDto) {
- inspectionRecordsService.upByProductId(inspectionRecordsDto);
- return Result.success("淇敼鎴愬姛!");
- }
-
- /**
- * 灏嗗緟鎻愪氦鐨勭殑妫�楠岄」鐩殑妫�娴嬭褰曠殑鐘舵�佽浆涓哄緟瀹℃牳
- * @param id
- * @return
- */
- @ApiOperation("淇濆瓨骞舵彁浜ゆ楠屾姤鍛�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "妫�楠岃褰旾D", dataTypeClass = Integer.class, required = true),
- })
- @PostMapping("/submitRecords/{id}")
- public Result submitRecords(@PathVariable Integer id) {
- inspectionRecordsService.submitRecords(id);
- return Result.success("鎻愪氦鎴愬姛!");
- }
-
-
-}
-
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
deleted file mode 100644
index d6651db..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-
-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;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-@Api(tags = "妫�楠屾ā鍧�-->妫�楠岃鍒�")
-@RestController
-@RequestMapping("/plan")
-public class PlanController {
-
- @Resource
- private PlanService planService;
-
- @Resource
- ProductService productService;
-
- @ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "state", value = "鐘舵��(涓虹┖=寰呭垎閰�)", dataTypeClass = Integer.class)
- })
- @GetMapping("/selectAllPlan")
- public Result selectAllPlan(int pageSize, int countSize, Integer state) {
- return Result.success(planService.selectAllPlan(pageSize, countSize, state));
- }
-
- @ApiOperation("鏍规嵁椤圭洰鍚嶆煡璇㈡墍鏈夎瘯楠屾柟娉�")
- @GetMapping("/selectInstrumentByProname")
- public Result selectInstrumentByProname(String name) {
- return Result.success(productService.selectInstrumentByProname(name));
- }
-
- @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 = {
- @ApiImplicitParam(name = "id", value = "妫�楠岃鍒扞D", dataTypeClass = Integer.class, required = true),
- })
- @PutMapping("/delPlan/{id}")
- public Result delPlan(@PathVariable Integer id) {
- planService.delPlan(id);
- return Result.success();
- }
-
- @ApiOperation("鏌ヨ鎴愬搧妫�楠�")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "state", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class)
- })
- @GetMapping("/selectInspection")
- public Result selectInspection(int pageSize, int countSize, Integer state) {
- return Result.success(planService.selectInspection(pageSize,countSize,state));
- }
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
index e312512..010634d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
@@ -29,7 +29,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-28
*/
-@Api(tags = "1銆佺墿鏂欒〃")
+@Api(tags = "鎶ユ绠＄悊-->鍘熸潗鏂欐姤妫�")
@RestController
@RequestMapping("/raw-material")
public class RawMaterialController {
@@ -43,11 +43,11 @@
@ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "materialCoding", value = "鏉愭枡缂栫爜", dataTypeClass = String.class),
@ApiImplicitParam(name = "materialName", value = "鏉愭枡鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "condition", value = "鐘舵��", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "condition", value = "鐘舵��", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "createTime", value = "鏉ユ枡鏃ユ湡", dataTypeClass = String.class)
})
@GetMapping("/selectAll")
- public Result<?> selectRawMaterial(Integer pageSize, Integer pageNo, String materialCoding, String materialName, String condition, String createTime) {
+ public Result<?> selectRawMaterial(Integer pageSize, Integer pageNo, String materialCoding, String materialName, Integer condition, String createTime) {
IPage<RawMaterial> iPage = rawMaterialService.selectRawMaterial(materialCoding, materialName, condition, createTime, new Page<Objects>(pageNo, pageSize));
Map<String, Object> map = new HashMap<>();
map.put("row", iPage.getRecords());
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
index 194aa4a..060fa40 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java
@@ -1,23 +1,28 @@
package com.yuanchu.limslaboratory.mapper;
-import com.yuanchu.limslaboratory.pojo.Inspection;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import java.util.List;
import java.util.Map;
/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
+ * 鐢宠琛�(Inspection)琛ㄦ暟鎹簱璁块棶灞�
*
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:03:36
*/
public interface InspectionMapper extends BaseMapper<Inspection> {
- //鏌ヨ鎵�鏈夋楠屽崟鍒楄〃
- List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state);
-
+ /**
+ * 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
+ * @param page
+ * @param message
+ * @return
+ */
+ IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message);
}
+
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
deleted file mode 100644
index 6c8d8f7..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialListMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.yuanchu.limslaboratory.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-public interface InspectionMaterialListMapper extends BaseMapper<InspectionMaterialList> {
-
- //鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�
- List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId);
-
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialMapper.java
new file mode 100644
index 0000000..3145666
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMaterialMapper.java
@@ -0,0 +1,15 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterial;
+
+/**
+ * (鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂�(InspectionMaterial)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:28
+ */
+public interface InspectionMaterialMapper extends BaseMapper<InspectionMaterial> {
+
+}
+
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
deleted file mode 100644
index 1423320..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductListMapper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.yuanchu.limslaboratory.mapper;
-
-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.pojo.vo.InspectionProductListVo;
-import com.yuanchu.limslaboratory.service.InspectionProductListService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-public interface InspectionProductListMapper extends BaseMapper<InspectionProductList> {
-
-
- //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
- List<InspectionProductListVo> selectByMaterId(Integer id);
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
new file mode 100644
index 0000000..f73d82b
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
@@ -0,0 +1,15 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionProduct;
+
+/**
+ * 鐢宠鍗曚笅鐗╂枡涓殑椤圭洰(InspectionProduct)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:54
+ */
+public interface InspectionProductMapper extends BaseMapper<InspectionProduct> {
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionRecordsMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionRecordsMapper.java
deleted file mode 100644
index 6bc8c1e..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionRecordsMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yuanchu.limslaboratory.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.pojo.InspectionRecords;
-import com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Map;
-
-
-/**
- * 妫�娴嬭褰�(InspectionRecords)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author zss
- * @since 2023-07-24 14:05:11
- */
-public interface InspectionRecordsMapper extends BaseMapper<InspectionRecords> {
-
- //鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)鏌ヨ妫�娴嬭褰�
- InspectionRecordsDto selectByProductId(Integer productId,Integer submitState);
-}
-
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java
index b635709..95e0c2a 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/LinkBasicInformationMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import java.util.List;
import java.util.Map;
@@ -19,4 +20,18 @@
public interface LinkBasicInformationMapper extends BaseMapper<LinkBasicInformation> {
IPage<Map<String, Object>> getLinkBasicPage(Page<Object> page, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus);
+
+ /**
+ * 鏌ヨ鎵�鏈夊鎵樼敵璇峰拰鏍峰搧
+ * @return
+ */
+ List<Map<String, Object>> selectLinkAll();
+
+ /**
+ * 閫夋嫨濮旀墭鐢宠鍜屾牱鍝�
+ * @param bid
+ * @param did
+ * @return
+ */
+ InspectionVo selectLinkByid(Integer bid, Integer did);
}
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
deleted file mode 100644
index c453761..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/PlanMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.yuanchu.limslaboratory.mapper;
-
-import com.yuanchu.limslaboratory.pojo.Plan;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.limslaboratory.pojo.vo.FinPlanVo;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-public interface PlanMapper extends BaseMapper<Plan> {
-
- //鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
- List<PlanVo> selectAllPlan(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/mapper/RawMaterialMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java
index a47e6a5..567cf9f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java
@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -18,5 +21,10 @@
*/
public interface RawMaterialMapper extends BaseMapper<RawMaterial> {
- IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String condition, String createTime, Page<Objects> page);
+ IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page);
+
+
+ List<RawMaterial> selectRawmaAll();
+
+ InspectionVo selectRawmaById(Integer id);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
index 5c1f45f..3af517c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
@@ -1,83 +1,89 @@
package com.yuanchu.limslaboratory.pojo;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.io.Serializable;
/**
- * <p>
+ * 鐢宠琛�(Inspection)琛ㄥ疄浣撶被
*
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:04:05
*/
@Data
@Accessors(chain = true)
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="Inspection瀵硅薄", description="")
+@Builder
+@TableName("inspection")
public class Inspection implements Serializable {
-
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鎶ユ缂栧彿")
- private String id;
+ /**
+ * 鐢宠鍗曠紪鍙�
+ **/
+ @TableId(type = IdType.AUTO)
+ private Integer id;
- @ApiModelProperty(value = "鎶ユ绫诲瀷")
+ /**
+ * 鐢宠鍗曠紪鐮�
+ **/
+ private String code;
+
+ /**
+ * 妫�楠岀被鍨� 0锛氬師鏉愭枡锛�1锛氫骇鍝侊紱2锛氬崐鎴愬搧锛�
+ **/
private Integer type;
- @ApiModelProperty(value = "鎶ユ鐘舵�� 1锛氬凡妫�楠岋紱0鏈楠�")
+ /**
+ * 妫�楠岀姸鎬侊細1锛氬悎鏍硷紱0锛氫笉鍚堟牸
+ **/
private Integer inspectionStatus;
- @ApiModelProperty(value = "鏄惁鍚堟牸 1锛氭槸锛�0鍚�")
- private Integer qualifiedState;
-
- @ApiModelProperty(value = "1锛氬緟鎻愪氦锛�2锛氬凡鎻愪氦锛�0锛氬凡浣滃簾")
+ /**
+ * ${column.comment}
+ **/
private Integer state;
+ /**
+ * 鐧昏鏃ユ湡
+ **/
@TableField(fill = FieldFill.INSERT)
- @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
+ /**
+ * ${column.comment}
+ **/
@TableField(fill = FieldFill.INSERT_UPDATE)
- @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
- private Integer version;
+ /**
+ * 鍏宠仈 鐧昏浜猴紙鐢ㄦ埛id锛�
+ **/
+ private Integer userId;
- @ApiModelProperty(value = "鎶ユ浜�")
- private String userName;
+ /**
+ * 妫�楠屽紑濮嬫棩鏈�
+ **/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
- @ApiModelProperty(value = "鍏宠仈 妫�楠屼汉锛堢敤鎴穒d锛�")
- private Integer inspectUserId;
-
- @ApiModelProperty(value = "妫�楠屽紑濮嬫棩鏈�")
- private LocalDateTime inspectStartTime;
-
- @ApiModelProperty(value = "妫�楠岀粨鏉熸棩鏈�")
- private LocalDateTime inspectEndTime;
-
- public Inspection(Integer type, Integer inspectionStatus, Integer state, Integer version, String userName) {
- this.type = type;
- this.inspectionStatus = inspectionStatus;
- this.state = state;
- this.version = version;
- this.userName = userName;
- }
+ /**
+ * 妫�楠岀粨鏉熸棩鏈�
+ **/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java
new file mode 100644
index 0000000..55311dc
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterial.java
@@ -0,0 +1,97 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂�(InspectionMaterial)琛ㄥ疄浣撶被
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:28
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@TableName("inspection_material")
+public class InspectionMaterial implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * id
+ **/
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鐗╂枡缂栫爜
+ **/
+ private String code;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ **/
+ private String name;
+
+ /**
+ * 鎶ユ鏁伴噺-鐗╂枡鏁伴噺
+ **/
+ private Integer num;
+
+ /**
+ * 鍗曚綅
+ **/
+ private String unit;
+
+ /**
+ * 渚涘簲鍟�
+ **/
+ private String supplier;
+
+ /**
+ * 瑙勬牸鍚嶇О-鍨嬪彿鍚嶇О
+ **/
+ private String specifications;
+
+ /**
+ * 鏉ユ枡鏃ユ湡
+ **/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date formTime;
+
+ /**
+ * ${column.comment}
+ **/
+ private Integer state;
+
+ /**
+ * ${column.comment}
+ **/
+ @TableField(fill = FieldFill.INSERT)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * ${column.comment}
+ **/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * 鍏宠仈 鐢宠鍗昳d
+ **/
+ private Integer inspectionId;
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java
deleted file mode 100644
index dca2648..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionMaterialList.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.yuanchu.limslaboratory.pojo;
-
-
-import java.io.Serializable;
-
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.apache.ibatis.annotations.Insert;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="InspectionMaterialList瀵硅薄", description="")
-public class InspectionMaterialList implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "id", hidden = true)
- private int id;
-
- @ApiModelProperty(value = "materialId")
- private String materialId;
-
- /**
- * 鎶ユ鏁伴噺-鐗╂枡鏁伴噺
- */
- @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;
-
- @ApiModelProperty(value = "", hidden = true)
- private Integer state;
- /**
- * 鎶ユ鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "鎶ユ鏃堕棿", hidden = true)
- private Date createTime;
- /**
- *
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "", hidden = true)
- private Date updateTime;
- /**
- *
- */
- @ApiModelProperty(value = "", hidden = true)
- private Integer version;
- /**
- * 鍏宠仈 鎶ユ鍗昳d
- */
- @ApiModelProperty("鍏宠仈 鎶ユ鍗昳d")
- private String inspectionId;
-
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
new file mode 100644
index 0000000..978a274
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
@@ -0,0 +1,100 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 鐢宠鍗曚笅鐗╂枡涓殑椤圭洰(InspectionProduct)琛ㄥ疄浣撶被
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:55
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@Builder
+@TableName("inspection_product")
+public class InspectionProduct implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 椤圭洰id
+ **/
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 椤圭洰鍚嶇О
+ **/
+ private String name;
+
+ /**
+ * 鍗曚綅
+ **/
+ private String unit;
+
+ /**
+ * 瑕佹眰鍊�
+ **/
+ private String required;
+
+ /**
+ * 鍐呮帶鍊�
+ **/
+ private String internal;
+
+ /**
+ * 妫�娴嬪��
+ **/
+ private String testValue;
+
+ /**
+ * 缁撹 0锛氫笉鍚堟牸锛�1锛氬悎鏍�
+ **/
+ private Integer testState;
+
+ /**
+ * ${column.comment}
+ **/
+ private Integer state;
+
+ /**
+ * ${column.comment}
+ **/
+ @TableField(fill = FieldFill.INSERT)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * ${column.comment}
+ **/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * 鍏宠仈 鎶ユ鐗╂枡id
+ **/
+ private Integer inspectionMaterialId;
+
+ /**
+ * 鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�
+ **/
+ private Integer userId;
+
+ /**
+ * 鍏宠仈 璁惧id
+ **/
+ private Integer instrumentId;
+}
+
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
deleted file mode 100644
index 8afabf1..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.yuanchu.limslaboratory.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="InspectionProductList瀵硅薄", description="")
-@Accessors(chain = true)
-public class InspectionProductList implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "椤圭洰id")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
- private String name;
-
- @ApiModelProperty(value = "璇曢獙鏂规硶")
- private String method;
-
- @ApiModelProperty(value = "璇曢獙瑕佹眰")
- private String ask;
-
- @ApiModelProperty(value = "鍗曚綅")
- private String unit;
-
- @ApiModelProperty(value = "鎷涙爣浜鸿姹傚��")
- private String required;
-
- @ApiModelProperty(value = "鍐呮帶鍊�")
- private String internal;
-
- @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;
-
- @TableLogic(value = "1", delval = "0")
- @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- 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;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
-
- private Integer version;
-
- @ApiModelProperty(value = "鍏宠仈 鎶ユ鐗╂枡id")
- private int inspectionMaterialListId;
-
- @ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
- private Integer userId;
-
- @ApiModelProperty(value = "鍏宠仈 璁惧id")
- private Integer instrumentId;
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionRecords.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionRecords.java
deleted file mode 100644
index aff8071..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionRecords.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.yuanchu.limslaboratory.pojo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * 妫�娴嬭褰�(InspectionRecords)琛ㄥ疄浣撶被
- *
- * @author zss
- * @since 2023-07-24 14:05:12
- */
-@ApiModel(value="InspectionRecords瀵硅薄", description="")
-@Data
-@TableName("inspection_records")
-public class InspectionRecords implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 璁板綍id
- */
- @ApiModelProperty(value = "璁板綍id")
- @TableField("id")
- private Integer id;
-
- /**
- * 妫�娴嬫柟娉�
- */
- @ApiModelProperty(value = "妫�娴嬫柟娉�")
- @TableField("method")
- private String method;
-
- /**
- * 妫�娴嬬殑鏍峰搧鏁伴噺
- */
- @ApiModelProperty(value = "妫�娴嬬殑鏍峰搧鏁伴噺")
- @TableField("num")
- private Integer num;
-
- /**
- * 妫�娴嬪��
- */
- @ApiModelProperty(value = "妫�娴嬪��")
- @TableField("value")
- private String value;
-
- /**
- * 鎻愪氦鐘舵�� 0锛氬緟鎻愪氦锛�1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃
- */
- @ApiModelProperty(value = "0锛氬緟鎻愪氦锛�1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃")
- @TableField("submit_state")
- private Integer submitState;
-
- @ApiModelProperty(value = "${column.comment}")
- @TableField("state")
- private Integer state;
-
- @ApiModelProperty(value = "妫�娴嬫棩鏈�")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "${column.comment}")
- @TableField("version")
- private Integer version;
-
- /**
- * 鍏宠仈 鏍峰搧涓嬬殑椤圭洰id
- */
- @ApiModelProperty(value = "鍏宠仈 鏍峰搧涓嬬殑椤圭洰id")
- @TableField("inspection_product_list_id")
- private Integer inspectionProductListId;
-
- /**
- * 鍏宠仈 瀹℃壒浜猴紙鐢ㄦ埛鍚嶇О锛�
- */
- @ApiModelProperty(value = "鍏宠仈 瀹℃壒浜猴紙鐢ㄦ埛鍚嶇О锛�")
- @TableField("user_name")
- private Integer userName;
-
- /**
- * 瀹℃壒鏃ユ湡
- */
- @ApiModelProperty(value = "瀹℃壒鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("approval_time")
- private LocalDateTime approvalTime;
-}
-
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
deleted file mode 100644
index 9593346..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Plan.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.yuanchu.limslaboratory.pojo;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-@Data
-@Accessors(chain = true)
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="Plan瀵硅薄", description="")
-public class Plan implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty(value = "璁″垝缂栧彿")
- private Integer id;
-
- @ApiModelProperty(value = "妫�楠岀粨鏋� 0锛氭湭瀹屾垚锛�1锛氬凡瀹屾垚锛�")
- private int results;
-
- @ApiModelProperty(value = "璇曢獙璇存槑")
- private String thing;
-
- @ApiModelProperty(value = "1锛氬緟璁ら锛�2锛氬緟鍒嗛厤锛�3锛氬凡鍒嗛厤锛�4锛氳秴鏈熷緟鍒嗛厤锛�5锛氬凡瀹屾垚锛�0锛氬凡浣滃簾")
- 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;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateTime;
-
- private Integer version;
-
- @ApiModelProperty(value = "鍏宠仈 鎶ユid(鐢宠鍗曠紪鍙�)")
- private String inspectionId;
-
- @ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id(璐熻矗浜篿d)")
- private Integer userId;
-
-
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
index 3a20172..372dd04 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
@@ -60,10 +60,10 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime dateSurvey;
- @ApiModelProperty(value = "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��0:寰呮娴�;1:宸叉娴�")
private Integer condition;
- @TableLogic(value = "1", delval = "0")
+// @TableLogic(value = "1", delval = "0")
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private 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
deleted file mode 100644
index 1378035..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionDto.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.yuanchu.limslaboratory.pojo.dto;
-
-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;
- @ApiModelProperty(value = "妫�楠屼汉鍚嶇О")
- private String inspectUserName;
-
-}
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
deleted file mode 100644
index 90f730e..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionMaterialListDto.java
+++ /dev/null
@@ -1,77 +0,0 @@
-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
deleted file mode 100644
index 8f5ccfa..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionProductListDto.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.yuanchu.limslaboratory.pojo.dto;
-
-
-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 InspectionProductListDto implements Serializable {
-
-
- @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 = "鍏宠仈妫�楠岄」鐩瘯楠屽憳id")
- @JsonSerialize
- private Integer userId;
-
- @ApiModelProperty(value = "鍏宠仈 璁惧id")
- @JsonSerialize
- 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
deleted file mode 100644
index bf3ab30..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/InspectionRecordsDto.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.yuanchu.limslaboratory.pojo.dto;
-
-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/vo/FinPlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java
deleted file mode 100644
index b90fd31..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/FinPlanVo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-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 FinPlanVo implements Serializable {
-
- @ApiModelProperty(value = "璁″垝缂栧彿")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "鏍峰搧缂栧彿")
- @JsonSerialize
- private int mid;
-
- @ApiModelProperty(value = "鍏宠仈 鎶ユid(鐢宠鍗曠紪鍙�)")
- @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 userName;
-
- @ApiModelProperty(value = "鍏宠仈 妫�楠屼汉")
- @JsonSerialize
- private String inspectUserName;
-
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
new file mode 100644
index 0000000..089d728
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
@@ -0,0 +1,66 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class InsProductVo implements Serializable {
+
+ /**
+ * 椤圭洰鍚嶇О
+ **/
+ @JsonSerialize
+ private String name;
+
+ /**
+ * 鍗曚綅
+ **/
+ @JsonSerialize
+ private String unit;
+
+ /**
+ * 鏍囧噯鍊�
+ **/
+ @JsonSerialize
+ private String required;
+
+ /**
+ * 鍐呮帶鍊�
+ **/
+ @JsonSerialize
+ private String internal;
+
+ /**
+ * 妫�娴嬪��
+ **/
+ @JsonSerialize
+ private String testValue;
+
+ /**
+ * 缁撹 0锛氫笉鍚堟牸锛�1锛氬悎鏍�
+ **/
+ @JsonSerialize
+ private Integer testState;
+
+ /**
+ * 璁惧鍚嶇О
+ **/
+ @JsonSerialize
+ private String instrumentName;
+
+ /**
+ * 鍏宠仈 鐢宠鍗昳d
+ **/
+ @JsonSerialize
+ private Integer inspectionMaterialId;
+
+ /**
+ * 妫�楠屽憳
+ **/
+ @JsonSerialize
+ private String userName;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectDetailVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectDetailVo.java
new file mode 100644
index 0000000..16a58cb
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectDetailVo.java
@@ -0,0 +1,94 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+//鏌ヨ妫�楠屽崟璇︽儏(妫�楠屽熀鏈俊鎭互鍙婃楠岄」鐩俊鎭�)
+public class InspectDetailVo implements Serializable {
+
+ /* 妫�楠岃鎯� */
+ /**
+ * 鏉ユ枡鏃ユ湡
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date formTime;
+
+ /**
+ * 渚涘簲鍟�
+ **/
+ @JsonSerialize
+ private String supplier;
+
+ /**
+ * 鍘熸潗鏂欑紪鐮�
+ */
+ @JsonSerialize
+ private String code;
+
+ /**
+ * 鍘熸潗鏂欏悕绉�
+ */
+ @JsonSerialize
+ private String name;
+
+ /**
+ * 鍨嬪彿瑙勬牸
+ */
+ @JsonSerialize
+ private String specifications;
+
+ /**
+ * 鍗曚綅
+ */
+ @JsonSerialize
+ private String unit;
+
+ /**
+ * 鏁伴噺
+ */
+ @JsonSerialize
+ private Integer num;
+
+ /**
+ * 妫�楠屽紑濮嬫棩鏈�
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
+
+
+ /**
+ * 妫�楠岀粨鏉熸棩鏈�
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
+
+
+ /**
+ * 鎶ユ浜猴紙褰撳墠鐢ㄦ埛鍚嶏級
+ */
+ @JsonSerialize
+ private String userName;
+
+ /* 妫�楠岄」鐩� */
+ @JsonSerialize
+ private List<InsProductVo> insProducts;
+
+ /* 妫�楠岀粨璁� */
+ /**
+ * 鍚堟牸鐘舵�� 0锛氫笉鍚堟牸锛�1锛氬悎鏍�
+ */
+ @JsonSerialize
+ private Integer inspectionStatus;
+}
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
deleted file mode 100644
index d76aae2..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionProductListVo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.yuanchu.limslaboratory.pojo.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.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/InspectionVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
new file mode 100644
index 0000000..f804333
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
@@ -0,0 +1,76 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
+import java.util.Date;
+//鏂板妫�楠屽崟
+@Data
+public class InspectionVo implements Serializable {
+
+ /**
+ *妫�楠岀被鍨� 0锛氬師鏉愭枡锛�1锛氫骇鍝侊紱2锛氬崐鎴愬搧锛�
+ **/
+ @JsonSerialize
+ private Integer type;
+
+ /**
+ * 鏉ユ枡鏃ユ湡
+ **/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date formTime;
+
+ /**
+ * 渚涘簲鍟�
+ **/
+ @JsonSerialize
+ private String supplier;
+
+ /**
+ * 鐗╂枡缂栫爜
+ **/
+ @JsonSerialize
+ private String mcode;
+
+ /**
+ * 鐗╂枡鍚嶇О
+ **/
+ @JsonSerialize
+ private String name;
+
+ /**
+ * 瑙勬牸鍚嶇О-鍨嬪彿鍚嶇О
+ **/
+ @JsonSerialize
+ private String specifications;
+
+ /**
+ * 鍗曚綅
+ **/
+ @JsonSerialize
+ private String unit;
+
+ /**
+ * 鎶ユ鏁伴噺-鐗╂枡鏁伴噺
+ **/
+ @JsonSerialize
+ private Integer num;
+
+ /**
+ * 妫�楠屽紑濮嬫棩鏈�
+ **/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
+
+ /**
+ * 妫�楠岀粨鏉熸棩鏈�
+ **/
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
deleted file mode 100644
index e68fea1..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
+++ /dev/null
@@ -1,89 +0,0 @@
-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
deleted file mode 100644
index 8a022fd..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialListService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-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;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-public interface InspectionMaterialListService extends IService<InspectionMaterialList> {
-
- /**
- * 鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�
- * @param insId
- * @return
- */
- List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId);
-
- /**
- * 娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�
- * @param inspectionMaterialList
- * @param userId
- * @return
- */
- void addInspectionMaterialList(InspectionMaterialList inspectionMaterialList,String userId);
-
- /**
- * 鏍规嵁妫�楠屾牱鍝乮d鍒犻櫎鏍峰搧淇℃伅
- * @param inspectionMaterialListId
- * @return
- */
- void delInspectionMaterialListByInsId(int inspectionMaterialListId);
-
- /**
- *鏍规嵁鏍峰搧id淇敼鏍峰搧淇℃伅
- * @param inspectionMaterialListId
- * @param inspectionMaterialListDto
- * @return
- */
- void updateInspectionMaterialList(Integer inspectionMaterialListId, InspectionMaterialListDto inspectionMaterialListDto);
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialService.java
new file mode 100644
index 0000000..3c65806
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionMaterialService.java
@@ -0,0 +1,15 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterial;
+
+/**
+ * (鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂�(InspectionMaterial)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:28
+ */
+public interface InspectionMaterialService extends IService<InspectionMaterial> {
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
deleted file mode 100644
index 7b792f4..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductListService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-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 com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-public interface InspectionProductListService extends IService<InspectionProductList> {
-
-
- /**
- * 鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
- * @param id
- * @return
- */
- List<InspectionProductListVo> selectProductById(Integer id);
-
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java
new file mode 100644
index 0000000..3a367c5
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionProductService.java
@@ -0,0 +1,23 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.InspectionProduct;
+import com.yuanchu.limslaboratory.pojo.vo.InsProductVo;
+
+/**
+ * 鐢宠鍗曚笅鐗╂枡涓殑椤圭洰(InspectionProduct)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:54
+ */
+public interface InspectionProductService extends IService<InspectionProduct> {
+
+ /**
+ * 鏇存柊妫�楠岄」鐩�
+ * @param userId
+ * @param inspectionProduct
+ * @return
+ */
+ boolean updateInsProduct(Integer userId, InspectionProduct inspectionProduct);
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionRecordsService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionRecordsService.java
deleted file mode 100644
index ae7b079..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionRecordsService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.limslaboratory.pojo.InspectionRecords;
-import com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 妫�娴嬭褰�(InspectionRecords)琛ㄦ湇鍔℃帴鍙�
- *
- * @author zss
- * @since 2023-07-24 14:05:12
- */
-public interface InspectionRecordsService extends IService<InspectionRecords> {
-
- /**
- * 鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)鏌ヨ妫�娴嬭褰�
- * @param productId
- * @return
- */
- InspectionRecordsDto selectByProductId(Integer productId, Integer submitState);
-
- /**
- * 鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)淇敼妫�娴嬭褰�
- * @param inspectionRecordsDto
- */
- void upByProductId(InspectionRecordsDto inspectionRecordsDto);
-
- /**
- * 鏍规嵁妫�楠岃褰昳d淇敼鎻愪氦鐘舵��
- * @param id
- */
- void submitRecords(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 7c17380..e95c474 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
@@ -1,51 +1,53 @@
package com.yuanchu.limslaboratory.service;
-import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.limslaboratory.pojo.dto.InspectionDto;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.vo.InspectDetailVo;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import java.util.List;
import java.util.Map;
/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
+ * 鐢宠琛�(Inspection)琛ㄦ湇鍔℃帴鍙�
*
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:03:36
*/
public interface InspectionService extends IService<Inspection> {
- /**
- * 娣诲姞妫�楠屽崟
- * @param userName
- * @param type
- * @return
- */
- Inspection addInspection(String userName,int type);
/**
- * 鍒嗛〉鏌ヨ鎵�鏈夋楠屽崟
- * @param pageSize
- * @param countSize
- * @param state
+ *鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
+ * @param page
+ * @param message
* @return
*/
- List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state);
+ IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message);
/**
- *鏍规嵁妫�楠屽崟id浣滃簾妫�楠屽崟鐢宠
- * @param inspectionId
+ * 鏂板妫�楠岀敵璇疯〃
+ * @param id
+ * @param
* @return
*/
- void delInspectionByInsId(String inspectionId);
+ Integer addInspect(Integer id, InspectionVo inspectionVo);
+
/**
- * 鏍规嵁妫�楠屽崟id鎻愪氦妫�楠岀敵璇�
- * @param inspectionId
+ *鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
+ * @param id
* @return
*/
- void subInspectionByInsId(String inspectionId);
+ InspectDetailVo selectInspectsListById(Integer id);
+ /**
+ * 涓婃姤(鏇存柊妫�楠屽崟妫�楠岀粨鏋�)
+ * @param id
+ * @return
+ */
+ boolean updateInspectsById(Integer id);
}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
index df2dd51..02b7207 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/LinkBasicInformationService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -23,4 +24,18 @@
String addLinkBasicInformation(LinkBasicInformation linkBasicInformation);
IPage<Map<String, Object>> getLinkBasicPage(Page<Object> page, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus);
+
+ /**
+ *鏌ヨ鎵�鏈夊鎵樻楠屽拰鏍峰搧
+ * @return
+ */
+ List<Map<String, Object>> selectLinkAll();
+
+ /**
+ * 鏍规嵁濮旀墭妫�楠宨d鍜屾牱鍝乮d鏌ヨ濮旀墭妫�楠屽拰鏍峰搧
+ * @param bid
+ * @param did
+ * @return
+ */
+ InspectionVo selectLinkByid(Integer bid, Integer did);
}
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
deleted file mode 100644
index 397c3f9..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-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.vo.FinPlanVo;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-public interface PlanService extends IService<Plan> {
-
- /**
- * 鍒嗛〉鏌ヨ鎵�鏈夋楠岃鍒�
- * @param pageSize
- * @param countSize
- * @param state
- * @return
- */
- List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state);
-
- /**
- * 鏍规嵁璁″垝id浣滃簾妫�楠岃鍒�
- * @param id
- * @return
- */
- void delPlan(Integer id);
-
-
-
- /**
- * 缁欐楠岃鍒掍腑鐨勬楠岄」鐩垎閰嶈瘯楠屽憳,璁惧,浠ュ強鏃ユ湡
- * @param inspectionProductListDto
- */
- void upPlan(Integer id ,InspectionProductListDto inspectionProductListDto);
-
- /**
- * 鏌ヨ鎴愬搧妫�楠�
- * @param pageSize
- * @param countSize
- * @param state
- * @return
- */
- List<FinPlanVo> selectInspection(int pageSize, int countSize, Integer state);
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
index 8ba5217..143225f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
@@ -4,13 +4,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* <p>
- * 鏈嶅姟绫�
+ * 鏈嶅姟绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -18,5 +22,20 @@
*/
public interface RawMaterialService extends IService<RawMaterial> {
- IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String condition, String createTime, Page<Objects> page);
+ IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page);
+
+ /**
+ * 鏌ヨ鍘熸潗鏂欐楠�
+ *
+ * @return
+ */
+ List<RawMaterial> selectRawmaAll();
+
+ /**
+ * 閫夋嫨鍘熸潗鏂欐姤妫�
+ *
+ * @param id
+ * @return
+ */
+ InspectionVo selectRawmaById(Integer id, String startTime, String endTime) throws ParseException;
}
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
deleted file mode 100644
index 52ddc13..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialListServiceImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.yuanchu.limslaboratory.service.impl;
-
-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.*;
-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;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-@Service
-public class InspectionMaterialListServiceImpl extends ServiceImpl<InspectionMaterialListMapper, InspectionMaterialList> implements InspectionMaterialListService {
-
- @Resource
- InspectionMaterialListMapper inspectionMaterialListMapper;
-
- @Resource
- ProductMapper productMapper;
-
- @Resource
- InspectionProductListService inspectionProductListService;
-
-
- //鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�
- @Override
- public List<InspectionMaterialList> selectInspectionMaterialListByInsId(String insId) {
- return inspectionMaterialListMapper.selectInspectionMaterialListByInsId(insId);
- }
-
- //娣诲姞妫�楠屽崟涓殑妫�楠屾牱鍝�
- @Override
- @Transactional(rollbackFor = Exception.class)
- 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())
- .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 void delInspectionMaterialListByInsId(int inspectionMaterialListId) {
- //鍒犻櫎妫�楠屾牱鍝�
- InspectionMaterialList list = new InspectionMaterialList();
- list.setState(0);
- list.setId(inspectionMaterialListId);
- inspectionMaterialListMapper.updateById(list);
- //鏍规嵁鏍峰搧id鍒犻櫎妫�楠屾牱鍝佷腑鐨勬楠岄」鐩�
- 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 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/InspectionMaterialServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialServiceImpl.java
new file mode 100644
index 0000000..60be3c0
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionMaterialServiceImpl.java
@@ -0,0 +1,19 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.mapper.InspectionMaterialMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterial;
+import com.yuanchu.limslaboratory.service.InspectionMaterialService;
+import org.springframework.stereotype.Service;
+
+/**
+ * (鏍峰搧)妫�楠屽崟閲岄潰鐨勭墿鏂�(InspectionMaterial)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:28
+ */
+@Service
+public class InspectionMaterialServiceImpl extends ServiceImpl<InspectionMaterialMapper, InspectionMaterial> implements InspectionMaterialService {
+
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
deleted file mode 100644
index e34d36e..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductListServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-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.pojo.vo.InspectionProductListVo;
-import com.yuanchu.limslaboratory.service.InspectionProductListService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-@Service
-public class InspectionProductListServiceImpl extends ServiceImpl<InspectionProductListMapper, InspectionProductList> implements InspectionProductListService {
-
- @Resource
- InspectionProductListMapper inspectionProductListMapper;
-
-
-
- //鏍规嵁鏍峰搧id鏌ヨ妫�楠岃鍒掓牱鍝侀噷闈㈢殑妫�楠岄」鐩�
- @Override
- public List<InspectionProductListVo> selectProductById(Integer id) {
- return inspectionProductListMapper.selectByMaterId(id);
- }
-
-
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java
new file mode 100644
index 0000000..c07063c
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java
@@ -0,0 +1,90 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.mapper.InspectionProductMapper;
+import com.yuanchu.limslaboratory.pojo.InspectionProduct;
+import com.yuanchu.limslaboratory.pojo.vo.InsProductVo;
+import com.yuanchu.limslaboratory.service.InspectionProductService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 鐢宠鍗曚笅鐗╂枡涓殑椤圭洰(InspectionProduct)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author zss
+ * @since 2023-08-03 13:04:54
+ */
+@Service
+public class InspectionProductServiceImpl extends ServiceImpl<InspectionProductMapper, InspectionProduct> implements InspectionProductService {
+
+ @Resource
+ InspectionProductMapper inspectionProductMapper;
+
+ //鏇存柊妫�楠岄」鐩�
+ @Override
+ public boolean updateInsProduct(Integer userId, InspectionProduct inspectionProduct) {
+ //璧嬪�兼楠屽憳id
+ inspectionProduct.setUserId(userId);
+ //鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�0
+ String testValue = inspectionProduct.getTestValue();//妫�楠屽��
+ String required = inspectionProduct.getRequired();//鏍囧噯鍊�
+ String internal = inspectionProduct.getInternal();//鍐呮帶鍊�
+ inspectionProduct.setTestState(checkValues(required, internal, testValue));
+ //鏍规嵁妫�楠岄」鐩悕鍜屽叧鑱旂殑妫�楠岀墿鏂檌d鏉ユ煡璇㈡楠岄」鐩殑鏁版嵁
+ LambdaUpdateWrapper<InspectionProduct> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(InspectionProduct::getInspectionMaterialId, inspectionProduct.getInspectionMaterialId())
+ .eq(InspectionProduct::getName, inspectionProduct.getName());
+ inspectionProductMapper.update(inspectionProduct, updateWrapper);
+ return true;
+ }
+
+ /*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
+ private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
+ boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
+ boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
+
+ if (isStandardValueSatisfied && isControlValueSatisfied) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+
+ private boolean isValueSatisfied(String valueStr, String detectionValueStr) {
+ String substring = valueStr.substring(1, 2);
+ if (substring.equals("=")) {
+ String operator = valueStr.substring(0, 2);
+ Double standardValue = Double.parseDouble(valueStr.substring(2));
+ Double detectionValue = Double.parseDouble(detectionValueStr);
+ switch (operator) {
+ case ">=":
+ return detectionValue >= standardValue;
+ case "<=":
+ return detectionValue <= standardValue;
+ default:
+ return false;
+ }
+ } else {
+ String operator = valueStr.substring(0, 1);
+ Double standardValue = Double.parseDouble(valueStr.substring(1));
+ Double detectionValue = Double.parseDouble(detectionValueStr);
+ switch (operator) {
+ case ">":
+ return detectionValue > standardValue;
+ case "鈮�":
+ return detectionValue >= standardValue;
+ case "鈮�":
+ return detectionValue <= standardValue;
+ case "<":
+ return detectionValue < standardValue;
+ case "=":
+ return detectionValue.equals(standardValue);
+ default:
+ return false;
+ }
+ }
+ }
+}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionRecordsServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionRecordsServiceImpl.java
deleted file mode 100644
index 67a4946..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionRecordsServiceImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-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.extension.service.impl.ServiceImpl;
-import com.yuanchu.limslaboratory.mapper.InspectionRecordsMapper;
-import com.yuanchu.limslaboratory.pojo.InspectionRecords;
-import com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto;
-import com.yuanchu.limslaboratory.service.InspectionRecordsService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.sql.Wrapper;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 妫�娴嬭褰�(InspectionRecords)琛ㄦ湇鍔″疄鐜扮被
- *
- * @author zss
- * @since 2023-07-24 14:05:12
- */
-@Service("inspectionRecordsService")
-public class InspectionRecordsServiceImpl extends ServiceImpl<InspectionRecordsMapper, InspectionRecords> implements InspectionRecordsService {
-
- @Resource
- InspectionRecordsMapper inspectionRecordsMapper;
-
- //鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)鏌ヨ妫�娴嬭褰�
- @Override
- public InspectionRecordsDto selectByProductId(Integer productId, Integer submitState) {
- //鐘舵�佷负绌虹殑鏃跺�欓粯璁や负寰呮彁浜�
- if (submitState==null){
- submitState=0;
- }
- return inspectionRecordsMapper.selectByProductId(productId,submitState);
- }
-
- //鏍规嵁鏍峰搧缂栧彿id浠ュ強鐘舵��(寰呮彁浜�)淇敼妫�娴嬭褰�
- @Override
- public void upByProductId(InspectionRecordsDto inspectionRecordsDto) {
- //???
- }
-
- //鏍规嵁妫�楠岃褰昳d淇敼鎻愪氦鐘舵��
- @Override
- public void submitRecords(Integer id) {
- //鏇存柊妫�楠岃褰曡〃
- InspectionRecords inspectionRecords = inspectionRecordsMapper.selectById(id);
- inspectionRecords.setSubmitState(1);
- inspectionRecords.setUpdateTime(LocalDateTime.now());
- inspectionRecordsMapper.updateById(inspectionRecords);
- //鏂板涓�涓楠屾姤鍛�
- }
-
-}
-
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 ebfb650..444d70c 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,102 +1,199 @@
package com.yuanchu.limslaboratory.service.impl;
-
+import cn.hutool.core.lang.Snowflake;
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.metadata.IPage;
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;
-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.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.mapper.*;
+import com.yuanchu.limslaboratory.pojo.*;
+import com.yuanchu.limslaboratory.pojo.vo.InsProductVo;
+import com.yuanchu.limslaboratory.pojo.vo.InspectDetailVo;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import com.yuanchu.limslaboratory.service.*;
+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.*;
+import java.util.stream.Collectors;
/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
+ * 鐢宠琛�(Inspection)琛ㄦ湇鍔″疄鐜扮被
*
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:03:36
*/
@Service
public class InspectionServiceImpl extends ServiceImpl<InspectionMapper, Inspection> implements InspectionService {
@Resource
- private InspectionMapper inspectionMapper;
+ InspectionMapper inspectionMapper;
@Resource
- private PlanMapper planMapper;
+ InspectionMaterialMapper inspectionMaterialMapper;
@Resource
- InspectionMaterialListMapper inspectionMaterialListMapper;
+ InspectionProductService inspectionProductService;
@Resource
- InspectionProductListService inspectionProductListService;
+ InspectionProductMapper inspectionProductMapper;
- //娣诲姞妫�楠岀敵璇峰崟
+ @Resource
+ MaterialMapper materialMapper;
+
+ @Resource
+ StandardService standardService;
+
+ @Resource
+ SpecificationsService specificationsService;
+
+ @Resource
+ ProductMapper productMapper;
+
+ @Resource
+ InstrumentService instrumentService;
+
+ @Resource
+ UserMapper userMapper;
+
+ /**
+ * 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
+ *
+ * @param message
+ * @return
+ */
@Override
- 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;
+ public IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message) {
+ return inspectionMapper.selectInspectsList(page, message);
}
- //鏌ヨ鎵�鏈夋楠屽崟鍒楄〃
+ /**
+ * 鏂板妫�楠岀敵璇疯〃
+ *
+ * @param id
+ * @param
+ * @return
+ */
@Override
- public List<InspectionDto> selectAllInspection(int pageSize, int countSize, Integer state) {
- return inspectionMapper.selectAllInspection((pageSize - 1) * countSize, pageSize * countSize, state);
- }
-
- //浣滃簾鐢宠妫�楠屽崟
- @Override
- public void delInspectionByInsId(String inspectionId) {
- /*妫�楠屽崟浣滃簾*/
- Inspection inspection = inspectionMapper.selectById(inspectionId);
- inspection.setState(0);
- inspectionMapper.updateById(inspection);
- /*妫�楠岃鍒掍綔搴�*/
- UpdateWrapper<Plan> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("inspection_id", inspectionId).set("state", 0);
- planMapper.update(new Plan(), updateWrapper);
- /*妫�楠屾牱鍝佷綔搴�(鏍规嵁鎶ユ鍗昳d鍒犻櫎鏍峰搧淇℃伅)*/
- UpdateWrapper<InspectionMaterialList> wrapper1 = new UpdateWrapper<>();
- wrapper1.eq("inspection_id", inspectionId).set("state", 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);
+ public Integer addInspect(Integer id, InspectionVo inspectionVo) {
+ /*鏂板妫�楠岀敵璇疯〃*/
+ Inspection inspection = Inspection.builder()
+ .startTime(inspectionVo.getStartTime())
+ .endTime(inspectionVo.getEndTime())
+ .type(inspectionVo.getType())
+ .code(new Snowflake(1, 1).nextIdStr())
+ .userId(id)
+ .build();
+ inspectionMapper.insert(inspection);
+ /*鏂板妫�楠屾牱鍝佽〃*/
+ InspectionMaterial inspectionMaterial = InspectionMaterial.builder()
+ .code(inspectionVo.getMcode())
+ .name(inspectionVo.getName())
+ .num(inspectionVo.getNum())
+ .unit(inspectionVo.getUnit())
+ .supplier(inspectionVo.getSupplier())
+ .specifications(inspectionVo.getSpecifications())
+ .formTime(inspectionVo.getFormTime())
+ .inspectionId(inspection.getId())
+ .build();
+ inspectionMaterialMapper.insert(inspectionMaterial);
+ /*鏂板妫�楠岄」鐩〃*/
+ //鑾峰彇鐗╂枡id
+ Material material = materialMapper.selectOne(Wrappers.<Material>query()
+ .eq("name", inspectionVo.getName())
+ .eq("code", inspectionVo.getMcode()));
+ //鑾峰彇瑙勬牸鍚嶇О鍜屽瀷鍙峰悕绉�
+ String specification = inspectionVo.getSpecifications();
+ String[] split = specification.split("-");
+ String stName = split[0];
+ String spName = split[1];
+ //鑾峰彇瑙勬牸id
+ Standard standard = standardService.getOne(Wrappers.<Standard>query()
+ .eq("name", stName)
+ .eq("material_id", material.getId()));
+ //鑾峰彇鍨嬪彿id
+ Specifications specifications = specificationsService.getOne(Wrappers.<Specifications>query()
+ .eq("name", spName)
+ .eq("standard_id", standard.getId()));
+ //鏍规嵁鍨嬪彿id鏌ヨ椤圭洰淇℃伅
+ List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specifications.getId()));
+ ArrayList<InspectionProduct> list = new ArrayList<>();
+ for (Product product : productList) {
+ InspectionProduct rawInsProduct = InspectionProduct.builder()
+ .name(product.getName())
+ .unit(product.getUnit())
+ .required(product.getRequired())
+ .internal(product.getInternal())
+ .inspectionMaterialId(material.getId())
+ .build();
+ list.add(rawInsProduct);
}
+ //妫�楠岄」鐩壒閲忔坊鍔�
+ inspectionProductService.saveBatch(list);
+ return inspection.getId();
}
- //鎻愪氦鐢宠妫�楠屽崟
+ //鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@Override
- public void subInspectionByInsId(String inspectionId) {
- Inspection inspection = inspectionMapper.selectById(inspectionId);
- //鐘舵�佹敼涓哄凡鎻愪氦2
- inspection.setState(2);
+ public InspectDetailVo selectInspectsListById(Integer id) {
+ /*灏嗘楠屽崟鍩烘湰淇℃伅鏌ヨ鍑烘潵骞跺皝瑁呭埌RawInspectVo瀵硅薄涓�*/
+ Inspection inspection = inspectionMapper.selectById(id);
+ InspectDetailVo inspectDetailVo = new InspectDetailVo();
+ //鎶ユ浜�
+ User user = userMapper.selectById(inspection.getUserId());
+ inspectDetailVo.setUserName(user.getName());
+ //鎶ユ寮�濮嬫椂闂村拰缁撴潫鏃堕棿
+ inspectDetailVo.setStartTime(inspection.getStartTime());
+ inspectDetailVo.setEndTime(inspection.getEndTime());
+ //妫�楠岀粨璁�
+ inspectDetailVo.setInspectionStatus(inspection.getInspectionStatus());
+ //鏌ヨ妫�楠岀墿鏂�
+ InspectionMaterial inspectionMaterial = inspectionMaterialMapper.selectOne(Wrappers.<InspectionMaterial>query().eq("inspection_id", id));
+ //鏉ユ枡鏃ユ湡,渚涘簲鍟嗗悕绉�,鍘熸潗鏂欑紪鐮�,鍘熸潗鏂欏悕绉�,瑙勬牸鍨嬪彿,鍗曚綅,鏁伴噺
+ BeanUtils.copyProperties(inspectionMaterial, inspectDetailVo);
+ /*鏌ヨ妫�楠屽崟閲岄潰鐨勬楠岄」鐩�,骞跺皝瑁呭埌RawInspectVo瀵硅薄涓�*/
+ LambdaQueryWrapper<InspectionProduct> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(InspectionProduct::getInspectionMaterialId, inspectionMaterial.getId());
+ List<InspectionProduct> inspectionProducts = inspectionProductMapper.selectList(queryWrapper);
+ //杩欓噷鏌ュ埌鐨勮澶噄d鍜屾楠屽憳id瑕佹煡璇㈠悕绉�
+ List<InsProductVo> insProductVos = inspectionProducts.stream().map(insProduct -> {
+ //灏嗕竴涓璞＄殑鍊艰祴鍊肩粰鍙︿竴涓璞�
+ InsProductVo insProductVo = new InsProductVo();
+ BeanUtils.copyProperties(insProduct, insProductVo);
+ //鑾峰彇璁惧鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
+ if (insProduct.getInstrumentId() != null) {
+ String equipmentName = instrumentService.getById(insProduct.getInstrumentId()).getEquipmentName();
+ insProductVo.setInstrumentName(equipmentName);
+ }
+ //鑾峰彇鐢ㄦ埛鍚�(鍓嶆彁鏄鏋滃瓨鍦�)
+ if (insProduct.getUserId() != null) {
+ String userName = userMapper.selectById(insProduct.getUserId()).getName();
+ insProductVo.setUserName(userName);
+ }
+ //椤圭洰鍏宠仈鐗╂枡id
+ insProductVo.setInspectionMaterialId(inspectionMaterial.getId());
+ return insProductVo;
+ }).collect(Collectors.toList());
+ inspectDetailVo.setInsProducts(insProductVos);
+ return inspectDetailVo;
+ }
+
+ //鏇存柊妫�楠屽崟妫�楠岀粨鏋�
+ @Override
+ public boolean updateInspectsById(Integer id) {
+ //鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀姸鎬佸拰妫�楠岀粨璁�
+ InspectDetailVo inspectDetailVo = selectInspectsListById(id);
+ Inspection inspection = Inspection.builder()
+ .id(id)
+ .inspectionStatus(inspectDetailVo.getInspectionStatus())
+ .build();
inspectionMapper.updateById(inspection);
- //璁″垝琛ㄦ柊澧�
- Plan plan = Plan.builder().inspectionId(inspectionId).state(1).userId(inspection.getInspectUserId()).createTime(new Date()).build();
- planMapper.insert(plan);
+ //鐢熸垚鎶ュ憡鍗�
+
+ return true;
}
}
+
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
index 6bc5732..59be02e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/LinkBasicInformationServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
import com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.limslaboratory.service.LinkDetectionService;
@@ -48,4 +49,18 @@
public IPage<Map<String, Object>> getLinkBasicPage(Page<Object> page, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus) {
return linkBasicInformationMapper.getLinkBasicPage(page, entrustCoding, sampleName, entrusted, inspectionStatus);
}
+
+ //鏌ヨ鎵�鏈夊鎵樻楠屽拰鏍峰搧
+ @Override
+ public List<Map<String, Object>> selectLinkAll() {
+ return linkBasicInformationMapper.selectLinkAll();
+ }
+
+ //鏍规嵁濮旀墭妫�楠宨d鍜屾牱鍝乮d鏌ヨ濮旀墭妫�楠屽拰鏍峰搧
+ @Override
+ public InspectionVo selectLinkByid(Integer bid, Integer did) {
+ InspectionVo inspectionVo = linkBasicInformationMapper.selectLinkByid(bid, did);
+ inspectionVo.setType(1);
+ return inspectionVo;
+ }
}
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
deleted file mode 100644
index ef612f3..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.yuanchu.limslaboratory.service.impl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-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.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;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
- */
-@Service
-public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements PlanService {
-
- @Resource
- PlanMapper planMapper;
-
- @Resource
- InspectionProductListMapper inspectionProductListMapper;
-
- @Resource
- InspectionMaterialListMapper inspectionMaterialListMapper;
-
- @Resource
- InspectionProductListService inspectionProductListService;
-
- //鏌ヨ鎵�鏈夋楠岃鍒掑垎閰�
- @Override
- public List<PlanVo> selectAllPlan(int pageSize, int countSize, Integer state) {
- if (state == null) {
- state = 2;
- }
- return planMapper.selectAllPlan((pageSize - 1) * countSize, pageSize * countSize, state);
- }
-
- //浣滃簾妫�楠岃鍒�
- @Override
- public void delPlan(Integer id) {
- Plan plan = planMapper.selectById(id);
-
- /*妫�楠岃鍒掍綔搴�*/
- //鐘舵�佹敼涓轰綔搴�0
- plan.setState(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(Integer id, InspectionProductListDto inspectionProductListDto) {
- /*鏇存柊璁″垝琛ㄤ腑鐨勭姸鎬�(3:宸插垎閰�),鏇存柊鏃堕棿*/
- //鏌ヨ鎶ユ鍗昳d
- InspectionMaterialList inspectionMaterialList = inspectionMaterialListMapper.selectById(id);
- 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);
-
- /*鏇存柊妫�楠岄」鐩〃涓殑椤圭洰妫�楠屽紑濮嬫棩鏈�,椤圭洰妫�楠岀粨鏉熸棩鏈�,椤圭洰璇曢獙鍛�,璇曢獙瑕佹眰,鏇存柊鏃堕棿,璁惧id*/
- InspectionProductList inspectionProductList = new InspectionProductList();
- BeanUtils.copyProperties(inspectionProductListDto, inspectionProductList);
- inspectionProductList.setInspectionMaterialListId(id);
- //鏍规嵁鎶ユ鏍峰搧id鍜岄」鐩悕绉拌繘琛屾洿鏂版楠岄」鐩〃
- LambdaUpdateWrapper<InspectionProductList> updateWrapper2 = new LambdaUpdateWrapper<>();
- updateWrapper2.eq(InspectionProductList::getInspectionMaterialListId, inspectionProductList.getInspectionMaterialListId())
- .eq(InspectionProductList::getName, inspectionProductList.getName());
- inspectionProductListMapper.update(inspectionProductList, updateWrapper2);
- }
-
- //鏌ヨ鎴愬搧妫�楠�
- @Override
- 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/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
index e4220a0..2722a1a 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
@@ -1,20 +1,29 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.Instrument;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.mapper.RawMaterialMapper;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
@@ -26,8 +35,44 @@
@Resource
private RawMaterialMapper rawMaterialMapper;
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param materialCoding
+ * @param materialName
+ * @param condition
+ * @param createTime
+ * @param page
+ * @return
+ */
@Override
- public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, String condition, String createTime, Page<Objects> page) {
+ public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page) {
return rawMaterialMapper.selectRawMaterial(materialCoding, materialName, condition, createTime, page);
}
+
+ /**
+ * 鏌ヨ鎵�鏈夊師鏉愭枡鎶ユ鍗�
+ *
+ * @return
+ */
+ @Override
+ public List<RawMaterial> selectRawmaAll() {
+ return rawMaterialMapper.selectRawmaAll();
+ }
+
+ /**
+ * 閫夋嫨鍘熸潗鏂欐姤妫�
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public InspectionVo selectRawmaById(Integer id, String startTime, String endTime) throws ParseException {
+ InspectionVo inspectionVo = rawMaterialMapper.selectRawmaById(id);
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+ inspectionVo.setStartTime(formatter.parse(startTime));
+ inspectionVo.setEndTime(formatter.parse(endTime));
+ inspectionVo.setType(0);
+ return inspectionVo;
+ }
}
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index 41ca226..6d7526d 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -1,15 +1,29 @@
-<?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">
+<?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.InspectionMapper">
- <select id="selectAllInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionDto">
- select i.id, type, inspection_status, qualified_state, i.state, i.create_time, user_name, inspect_user_id,
- inspect_start_time, inspect_end_time, u.name inspectUserName
- from lims_laboratory.inspection i left join lims_laboratory.user u
- on i.inspect_user_id = u.id
- <if test="state!=null">
- where state = #{state}
+ <select id="selectInspectsList" resultType="map">
+ select i.id,
+ i.code icode,
+ type,
+ DATE_FORMAT(`form_time`,'%Y-%m-%d'),
+ supplier,
+ im.code mcode,
+ im.name,
+ specifications,
+ unit,
+ num,
+ DATE_FORMAT(i.`create_time`,'%Y-%m-%d'),
+ u.name userName,
+ inspection_status,
+ DATE_FORMAT(i.`start_time`,'%Y-%m-%d'),
+ DATE_FORMAT(i.`end_time`,'%Y-%m-%d')
+ from lims_laboratory.inspection i
+ join lims_laboratory.user u on i.user_id = u.id
+ join lims_laboratory.inspection_material im on i.id = im.inspection_id
+ where i.state=1
+ <if test="message!=null">
+ and i.code like concat('%', #{message}, '%')
+ or im.name like concat('%', #{message}, '%')
</if>
- order by i.create_time desc
- limit #{pageSize},#{countSize}
</select>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml
deleted file mode 100644
index 4838f4e..0000000
--- a/inspection-server/src/main/resources/mapper/InspectionMaterialListMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionMaterialListMapper">
- <select id="selectInspectionMaterialListByInsId" resultType="com.yuanchu.limslaboratory.pojo.InspectionMaterialList">
- select id,
- material_id,
- material_num,
- material_supplier,
- material_name,
- material_location,
- material_batch,
- material_reel_number,
- specifications_serial_number,
- specifications_voltage_level,
- specifications_cross_section,
- specifications_number_of_cores,
- specifications_instruct,
- notes
- from lims_laboratory.inspection_material_list
- where state = 1
- and inspection_id = #{insId}
- </select>
-</mapper>
diff --git a/inspection-server/src/main/resources/mapper/InspectionMaterialMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMaterialMapper.xml
new file mode 100644
index 0000000..d9f6112
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/InspectionMaterialMapper.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionMaterialMapper">
+</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
deleted file mode 100644
index 1eed103..0000000
--- a/inspection-server/src/main/resources/mapper/InspectionProductListMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionProductListMapper">
-
- <select id="selectByMaterId" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionProductListVo">
- select inspection_material_list_id,
- inspect_start_time inspectStartTime,
- inspect_end_time inspectEndTime,
- ipl.name,
- method,
- ask,
- unit,
- required,
- internal,
- start_time,
- end_time,
- uname userName,
- equipment_name instrumentName
- 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/InspectionProductMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
new file mode 100644
index 0000000..93e3111
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionProductMapper">
+</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/InspectionRecordsMapper.xml b/inspection-server/src/main/resources/mapper/InspectionRecordsMapper.xml
deleted file mode 100644
index 4e5e92a..0000000
--- a/inspection-server/src/main/resources/mapper/InspectionRecordsMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.yuanchu.limslaboratory.mapper.InspectionRecordsMapper">
- <select id="selectByProductId" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionRecordsDto">
- select yp.name,
- yp.username,
- ir.create_time,
- ir.update_time,
- ir.method,
- yp.ask,
- yp.mid,
- yp.material_name,
- yp.specifications_serial_number,
- yp.material_num
- from lims_laboratory.inspection_records ir
- left join (select ipl.id id,
- ipl.name,
- u.name username,
- ipl.ask,
- iml.id mid,
- iml.material_name,
- iml.specifications_serial_number,
- iml.material_num
- from lims_laboratory.inspection_product_list ipl
- left join lims_laboratory.inspection_material_list iml on ipl.inspection_material_list_id = iml.id left join
- lims_laboratory.user u on ipl.user_id = u.id) yp
- on ir.inspection_product_list_id = yp.id
- <where>
- <if test="productId != null">
- AND inspection_product_list_id = #{productId}
- </if>
- AND submit_state = #{submitState}
- </where>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index d17384b..0bc06a7 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -21,4 +21,33 @@
AND d.`inspection_status` = #{inspectionStatus}
</if>
</select>
+
+ <select id="selectLinkAll" resultType="java.util.Map">
+ SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`, d.`specifications_models`,
+ DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, l.`completion_deadline`, l.`contacts`, d.`date_survey`, d.`inspection_status`
+ FROM lims_laboratory.link_basic_information l, lims_laboratory.link_detection d
+ WHERE l.`id` = d.`link_basic_id`
+ AND l.`state` = 1
+ </select>
+
+ <select id="selectLinkByid" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionVo">
+ SELECT l.`inspection_time` formTime,
+ l.`entrusted` supplier,
+ d.`sample_number` mcode,
+ d.`sample_name` name,
+ d.`specifications_models` specifications,
+ d.`unit`,
+ d.`samples_number` num,
+ d.date_survey startTime,
+ l.completion_deadline endTime
+ FROM lims_laboratory.link_basic_information l, lims_laboratory.link_detection d
+ WHERE l.`id` = d.`link_basic_id`
+ AND l.`state` = 1
+ <if test="bid!=null">
+ and l.id=#{bid}
+ </if>
+ <if test="did!=null">
+ and d.id=#{did}
+ </if>
+ </select>
</mapper>
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
deleted file mode 100644
index 788786a..0000000
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.limslaboratory.mapper.PlanMapper">
- <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 state = #{state}
- </if>
- order by p.create_time desc
- limit #{pageSize},#{countSize}
- </select>
-
- <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
- 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>
- order by p.create_time desc
- limit #{pageSize},#{countSize}
- </select>
-</mapper>
diff --git a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
index 27d0b48..5cffc9a 100644
--- a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
+++ b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
@@ -19,4 +19,19 @@
AND DATE_FORMAT(r.`create_time`,'%Y-%m-%d') = #{createTime}
</if>
</select>
+ <select id="selectRawmaAll" resultType="com.yuanchu.limslaboratory.pojo.RawMaterial">
+ select * from lims_laboratory.raw_material where state=1
+ </select>
+
+ <select id="selectRawmaById" resultType="com.yuanchu.limslaboratory.pojo.vo.InspectionVo">
+ select create_time formTime,
+ supplier_name supplier,
+ material_coding mcode,
+ material_name name,
+ specifications_models specifications,
+ unit ,
+ quantity num
+ from lims_laboratory.raw_material
+ where id=#{id}
+ </select>
</mapper>
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 711a7be..944bd9d 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
@@ -18,7 +18,6 @@
* @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/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java
index 0d7fcdb..4c7b28b 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Instrument.java
@@ -39,6 +39,7 @@
private Integer userId;
@ApiModelProperty(value = "淇濈浜猴細鐢ㄦ埛琛ㄥ叧鑱擨d", hidden = true)
+ @TableField(value = "")
private Integer createUserId;
@ApiModelProperty(value = "浠櫒璁惧缂栧彿", example = "JSTC-W1-00001", required = true)
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 14f5c05..00c22c1 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
@@ -40,4 +40,5 @@
* @return
*/
List<Map> selectInstrument();
+
}
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 6df4b19..ea1cdce 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
@@ -19,6 +19,4 @@
//鏌ヨ鐗╂枡淇℃伅
List<Map> selectMaterialLimit(int num1,int num2, int type);
- //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
- Map selectMaterialById(String materialId);
}
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 10e6bb1..cbf5b02 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,7 +20,8 @@
*/
public interface ProductMapper extends BaseMapper<Product> {
- List<Product> selectProductByMaterialId(String materialId);
+ //鏍规嵁鐗╂枡id鏌ヨ妫�楠岄」鐩�
+ List<Map> selectProductByMaterialId(int materialId);
IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
index 17e3a2f..def7e4d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Specifications.java
@@ -30,11 +30,11 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "瑙勬牸id", hidden = true)
+ @ApiModelProperty(value = "鍨嬪彿id", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "瑙勬牸鍚嶇О", example = "AB", required = true)
+ @ApiModelProperty(value = "浜у搧鍨嬪彿鍚嶇О", example = "AB", required = true)
private String name;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
@@ -55,7 +55,7 @@
@Version
private Integer version;
- @ApiModelProperty(value = "鍏宠仈瀛楁 鐢ㄦ埛id", hidden = true)
+ @ApiModelProperty(value = "鍏宠仈瀛楁 瑙勬牸id", hidden = true)
private Integer standardId;
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Standard.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Standard.java
index 5671a73..d4345d8 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Standard.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/pojo/Standard.java
@@ -28,11 +28,11 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "鏍囧噯缂栧彿 yyMMdd000001(000001++)", example = "230711000001", required = true)
+ @ApiModelProperty(value = "瑙勬牸缂栧彿 yyMMdd000001(000001++)", example = "230711000001", required = true)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "鏍囧噯鍚嶇О", example = "鍏夌氦", required = true)
+ @ApiModelProperty(value = "瑙勬牸鍚嶇О", example = "鍏夌氦", required = true)
private String name;
@TableLogic(value = "1", delval = "0")
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 05e47dd..56e5501 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
@@ -20,7 +20,6 @@
List<Map> selectMaterialLimit(int pageSize,int countSize, int type);
- Map selectMaterialById(String materialId);
/**
* 鍒犻櫎绛変簬MaterialId鐨勬暟鎹�
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 83e6236..4ac533d 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
@@ -51,11 +51,7 @@
return materialMapper.selectMaterialLimit((pageSize - 1) * countSize,pageSize * countSize, type);
}
- //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
- @Override
- public Map selectMaterialById(String materialId) {
- return materialMapper.selectMaterialById(materialId);
- }
+
@Override
public Integer deleteMaterialInformation(Integer materialId) {
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 8853a62..9e71e62 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -3,31 +3,11 @@
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
<select id="selectMaterialLimit" resultType="Map">
- select id, name
+ select id,code, name
from lims_laboratory.material
where state = 1
and type = #{type}
order by create_time desc
limit #{num1},#{num2}
- </select>
- <select id="selectMaterialById" resultType="Map">
- select m.id,
- m.num,
- m.supplier,
- m.name,
- m.location,
- m.batch,
- m.reel_number reelNumber,
- concat(s.name, '/', sn.name) specificationSerialNum,
- s.voltage_level voltageLevel,
- s.cross_section crossSection,
- s.number_of_cores numberOfCores,
- s.instruct
- 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>
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 62d9615..e7d4c70 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -17,4 +17,13 @@
FROM product p
WHERE p.`father` = #{father}
</select>
+ <select id="selectProductByMaterialId" resultType="Map">
+ select p.name,unit,required,internal
+ from lims_laboratory.product p,
+ lims_laboratory.specifications sp,
+ lims_laboratory.standard st
+ where specifications_id=sp.id
+ and standard=st.id
+ and material_id=#{materialId}
+ </select>
</mapper>
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
index 37f1d72..9d91f2b 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
@@ -1,5 +1,4 @@
package com.yuanchu.limslaboratory;
-
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@@ -12,5 +11,6 @@
System.out.println("newString === " + newString);
}
-
}
+
+
--
Gitblit v1.9.3