From 82fbcce60ae86965441ae045df1f864d10005d35 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 21 八月 2023 17:59:46 +0800
Subject: [PATCH] 检验计划
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 49 +---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java | 15 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java | 1
inspection-server/src/main/resources/mapper/PlanMapper.xml | 10
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java | 7
inspection-server/src/main/resources/mapper/InspectionProductMapper.xml | 24 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java | 10
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 34 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 14
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionMapper.java | 3
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 5
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 47 +--
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java | 22 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java | 71 ------
/dev/null | 37 ---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 40 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 136 +++++++++++
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 30 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java | 11
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java | 22 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 38 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 9
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 12 -
25 files changed, 403 insertions(+), 250 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index fd379d3..bd72e5d 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
@@ -99,19 +99,15 @@
return Result.success(inspectionService.selectInspectsListById(id));
}
- @ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
+ @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));
+ @PostMapping("/delInspect")
+ public Result delInspect(Integer id) {
+ return Result.success(inspectionService.delInspect(id));
}
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 84e6ac8..70fd521 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -1,5 +1,7 @@
package com.yuanchu.limslaboratory.controller;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yuanchu.limslaboratory.pojo.Inspection;
import com.yuanchu.limslaboratory.service.PlanService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -10,7 +12,6 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
import javax.annotation.Resource;
/**
@@ -64,4 +65,23 @@
public Result distribution(Integer id, Integer userId, Integer instrumentId) {
return Result.success(planService.distribution(id, userId, instrumentId));
}
+
+ @ApiOperation("妫�楠�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "value", value = "妫�楠屽��", dataTypeClass = String.class)
+ })
+ @PostMapping("/check")
+ public Result check(Integer id, String value) {
+ return Result.success(planService.check(id, value));
+ }
+
+ @ApiOperation("涓婃姤")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/reported")
+ public Result reported(Integer id) {
+ return Result.success(planService.reported(id));
+ }
}
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 a5d2ce3..559238f 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
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.service.RawMaterialService;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -14,9 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
deleted file mode 100644
index f8b6e42..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportAuditingController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
-import com.yuanchu.limslaboratory.service.ReportAuditingService;
-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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-07
- */
-@Api(tags = "妫�楠屾ā鍧�-->鎶ュ憡瀹℃牳")
-@RestController
-@RequestMapping("/reportAuditing")
-public class ReportAuditingController {
- /**
- * 鏈嶅姟瀵硅薄
- */
- @Resource
- private ReportAuditingService reportAuditingService;
-
- @ApiOperation("鏌ヨ鎶ュ憡瀹℃牳鍐呭")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "page", value = "鍒濆椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "status", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "name", value = "鎼滅储淇℃伅", dataTypeClass = String.class)
- })
- @GetMapping("/selectAllReportAuditing")
- public Result selectAllReportCheck(Integer page, Integer pageSize, Integer status, String name) {
- IPage<ReportAuditingVo> reportPage = reportAuditingService.selectAllReportAuditing(new Page<Object>(page, pageSize), status, name);
- Map<String, Object> map = new HashMap<>();
- map.put("total", reportPage.getTotal());
- map.put("row", reportPage.getRecords());
- return Result.success(map);
- }
-
-}
-
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
index 5a3ece9..46c9563 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
@@ -5,15 +5,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
+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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -32,9 +32,7 @@
@RestController
@RequestMapping("/report")
public class ReportController {
- /**
- * 鏈嶅姟瀵硅薄
- */
+
@Resource
private ReportService reportService;
@@ -54,5 +52,35 @@
return Result.success(map);
}
+ @ApiOperation("鎻愪氦")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/submit")
+ public Result submit(Integer id) {
+ return Result.success(reportService.submit(id));
+ }
+
+ @ApiOperation("瀹℃牳")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "result", value = "瀹℃牳缁撹", dataTypeClass = String.class, required = true)
+ })
+ @PostMapping("/check")
+ public Result check(@RequestHeader("token") String token, Integer id, String result) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ return Result.success(reportService.check((String) unmarshal.get("name"), id, result));
+ }
+
+ @ApiOperation("鍒犻櫎")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屾姤鍛奿d", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/delreport")
+ public Result delreport(Integer id) {
+ return Result.success(reportService.delreport(id));
+ }
+
}
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 dd00306..89bfb3e 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
@@ -4,9 +4,6 @@
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;
/**
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
index f73d82b..482c0b5 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/InspectionProductMapper.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.limslaboratory.pojo.InspectionProduct;
+import java.util.List;
+
/**
* 鐢宠鍗曚笅鐗╂枡涓殑椤圭洰(InspectionProduct)琛ㄦ暟鎹簱璁块棶灞�
*
@@ -11,5 +13,13 @@
*/
public interface InspectionProductMapper extends BaseMapper<InspectionProduct> {
+ //鏍规嵁椤圭洰id灏嗗凡鏈夌殑妫�楠岀粨璁烘敼涓簄ull
+ void upda(Integer id);
+
+ //鏍规嵁妫�楠屽崟id鏌ヨ妫�楠岄」鐩殑妫�楠岀粨鏋�
+ List<Integer> getresult(Integer id);
+
+ //鏍规嵁妫�楠屾牱鍝乮d浣滃簾妫�楠岄」鐩�
+ void updat(Integer id);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
index c5f3504..d22692c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Report;
-import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
/**
@@ -24,10 +23,6 @@
*/
IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
- /**
- * 鏌ヨ鎶ュ憡瀹℃牳
- * @return
- */
- IPage<ReportAuditingVo> selectAllReportAuditing(Page<Object> page, Integer status, String name);
+
}
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 3af517c..bbaf1c4 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@@ -46,9 +47,7 @@
**/
private Integer inspectionStatus;
- /**
- * ${column.comment}
- **/
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
/**
@@ -59,9 +58,7 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
- /**
- * ${column.comment}
- **/
+
@TableField(fill = FieldFill.INSERT_UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
index 0ecf6b6..07e3da7 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
@@ -44,14 +44,21 @@
@ApiModelProperty(value = "鍏宠仈 鐢宠琛╥d")
private Integer inspectionId;
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
+ private Date checkTime;
+
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
private Date createTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
+ private Integer state;
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
deleted file mode 100644
index 7e7ffd1..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.yuanchu.limslaboratory.pojo.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 鎶ュ憡瀹℃牳
- */
-@Data
-public class ReportAuditingVo {
- @ApiModelProperty(value = "鏍峰搧缂栧彿")
- @JsonSerialize
- private String materialCode;
- @ApiModelProperty(value = "鎶ュ憡鍗曞彿")
- @JsonSerialize
- private String reportCode;
- @ApiModelProperty(value = "鏍峰搧鍚嶇О")
- @JsonSerialize
- private String materialName;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟閫氳繃")
- @JsonSerialize
- private Integer status;
- @ApiModelProperty(value = "瀹℃壒浜�")
- @JsonSerialize
- private Integer approver;
- @ApiModelProperty(value = "鎻愪氦鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date submitTime;
- @ApiModelProperty(value = "瀹℃牳鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date checkTime;
-}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
index 9c7849e..478437d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
@@ -1,32 +1,54 @@
package com.yuanchu.limslaboratory.pojo.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.Date;
/**
* 妫�楠屾姤鍛�
*/
@Data
public class ReportVo {
+
+ @ApiModelProperty(value = "妫�楠屾姤鍛奿d")
+ @JsonSerialize
+ private Integer id;
+
@ApiModelProperty(value = "鏍峰搧缂栧彿")
@JsonSerialize
private String materialCode;
+
@ApiModelProperty(value = "鎶ュ憡鍗曞彿")
@JsonSerialize
private String reportCode;
- @ApiModelProperty(value = "鐢宠鍗曞彿")
+
+ @ApiModelProperty(value = "妫�楠岀敵璇峰崟鍙�")
@JsonSerialize
private String inspectionCode;
- @ApiModelProperty(value = "瀹℃壒浜�")
+
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О")
@JsonSerialize
- private Integer approver;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡瀹℃牳")
- @JsonSerialize
- private Integer status;
+ private String materialName;
+
@ApiModelProperty(value = "妫�楠岀粨璁�")
@JsonSerialize
private String conclusion;
+
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃 3:涓嶉�氳繃")
+ @JsonSerialize
+ private Integer status;
+
+ @ApiModelProperty(value = "瀹℃壒浜�")
+ @JsonSerialize
+ private Integer approver;
+
+ @ApiModelProperty(value = "瀹℃牳鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
+ private Date checkTime;
+
@ApiModelProperty(value = "缂栧埗浜�")
@JsonSerialize
private String name;
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 e95c474..d7b39ed 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
@@ -43,11 +43,12 @@
*/
InspectDetailVo selectInspectsListById(Integer id);
+
/**
- * 涓婃姤(鏇存柊妫�楠屽崟妫�楠岀粨鏋�)
+ * 浣滃簾妫�楠屽崟
* @param id
* @return
*/
- boolean updateInspectsById(Integer id);
+ String delInspect(Integer id);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
index 65c7ba6..a35195a 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/PlanService.java
@@ -35,4 +35,19 @@
* @return
*/
String distribution(Integer id, Integer userId, Integer instrumentId);
+
+ /**
+ * 妫�楠�
+ * @param id
+ * @param value
+ * @return
+ */
+ String check(Integer id, String value);
+
+ /**
+ * 涓婃姤
+ * @param code
+ * @return
+ */
+ String reported(Integer id);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java
deleted file mode 100644
index 362ee97..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportAuditingService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-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.Report;
-import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-07
- */
-public interface ReportAuditingService extends IService<Report> {
-
- /**
- * 椤圭洰瀹℃牳琛ㄦ煡璇�
- * @return
- */
- IPage<ReportAuditingVo> selectAllReportAuditing(Page<Object> page, Integer status, String name);
-}
-
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
index f8a1f21..4e6476f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
@@ -23,5 +23,27 @@
* @return
*/
IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
+
+ /**
+ * 鎻愪氦
+ * @param id
+ * @return
+ */
+ String submit(Integer id);
+
+ /**
+ * 瀹℃牳
+ * @param name
+ * @param id
+ * @return
+ */
+ String check(String name, Integer id, String result);
+
+ /**
+ * 鍒犻櫎
+ * @param id
+ * @return
+ */
+ String delreport(Integer 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
index 7e63ffb..0c4f613 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionProductServiceImpl.java
@@ -1,14 +1,13 @@
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)琛ㄦ湇鍔″疄鐜扮被
@@ -19,72 +18,6 @@
@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/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index 66bfb6e..70809f8 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
@@ -2,7 +2,6 @@
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -13,11 +12,9 @@
import com.yuanchu.limslaboratory.pojo.vo.InspectDetailVo;
import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
import com.yuanchu.limslaboratory.service.*;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -61,8 +58,6 @@
@Resource
UserMapper userMapper;
- @Resource
- ReportMapper reportMapper;
/**
* 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
@@ -188,36 +183,24 @@
return inspectDetailVo;
}
- //鏇存柊妫�楠屽崟妫�楠岀粨鏋�
+ //浣滃簾妫�楠屽崟
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean updateInspectsById(Integer id) {
- //鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀姸鎬佸拰妫�楠岀粨璁�
- InspectDetailVo inspectDetailVo = selectInspectsListById(id);
- Inspection inspection = Inspection.builder()
- .id(id)
- .inspectionStatus(inspectDetailVo.getInspectionStatus())
- .build();
+ public String delInspect(Integer id) {
+ /*浣滃簾妫�楠屽崟*/
+ Inspection inspection = new Inspection();
+ inspection.setId(id);
+ inspection.setState(0);
inspectionMapper.updateById(inspection);
- //鐢熸垚鎶ュ憡鍗�
- Report report = new Report();
- //鐢熸垚鎶ュ憡鍗曞彿
- String code = MyUtil.getTimeSixNumberCode("BG","BG");
- //鑾峰彇妫�楠岀粨璁�
- String conclusion = "";
- Inspection inspection1 = inspectionMapper.selectById(id);
- if (inspection1.getInspectionStatus().equals(1)) {
- conclusion = "鍚堟牸";
- }else {
- conclusion = "涓嶅悎鏍�";
- }
- report.setCode(code);
- report.setStatus(0);
- report.setConclusion(conclusion);
- report.setInspectionId(id);
- reportMapper.insert(report);
-
- return true;
+ /*浣滃簾妫�楠屾牱鍝�*/
+ InspectionMaterial inspectionMaterial = inspectionMaterialMapper.selectOne(Wrappers.<InspectionMaterial>query().eq("inspection_id", id));
+ inspectionMaterial.setState(0);
+ inspectionMaterialMapper.updateById(inspectionMaterial);
+ /*浣滃簾妫�楠岄」鐩�*/
+ inspectionProductMapper.updat(inspectionMaterial.getId());
+ return "浣滃簾鎴愬姛!";
}
+
+
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java
index 8fc347c..97d000f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java
@@ -10,7 +10,6 @@
import com.yuanchu.limslaboratory.service.NonConformanceReviewService;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-
import javax.annotation.Resource;
/**
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
index 8eb52e3..bb63d1a 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -1,14 +1,13 @@
package com.yuanchu.limslaboratory.service.impl;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.yuanchu.limslaboratory.mapper.*;
-import com.yuanchu.limslaboratory.pojo.InspectionProduct;
-import com.yuanchu.limslaboratory.pojo.Instrument;
-import com.yuanchu.limslaboratory.pojo.User;
-import com.yuanchu.limslaboratory.service.InstrumentService;
+import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.service.PlanService;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
@@ -37,10 +36,16 @@
@Resource
InstrumentMapper instrumentMapper;
+ @Resource
+ ReportMapper reportMapper;
+
+ @Resource
+ InspectionMapper inspectionMapper;
+
//鏌ヨ妫�楠岃鍒�
@Override
- public List<Map<String,Object>> selectAllPlan(String code , String beginTime, String endTime,Integer status) {
- return planMapper.selectAllPlan(code,beginTime,endTime,status);
+ public List<Map<String, Object>> selectAllPlan(String code, String beginTime, String endTime, Integer status) {
+ return planMapper.selectAllPlan(code, beginTime, endTime, status);
}
//鍒嗛厤-->閫夋嫨妫�楠屼汉
@@ -52,7 +57,7 @@
//鍒嗛厤-->閫夋嫨璁惧
@Override
public List<Map<String, Object>> chooseinstum() {
- return null;
+ return instrumentMapper.chooseinstum();
}
//鍒嗛厤浜哄憳涓庤澶�
@@ -65,4 +70,117 @@
inspectionProductMapper.updateById(inspectionProduct);
return "鍒嗛厤瀹屾垚!";
}
+
+ //妫�楠�
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public String check(Integer id, String value) {
+ //濡傛灉妫�楠屽�间笉涓虹┖
+ if (StringUtils.isNotBlank(value)) {
+ InspectionProduct inspectionProduct = inspectionProductMapper.selectById(id);
+ //鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�0
+ String required = inspectionProduct.getRequired();//鏍囧噯鍊�
+ String internal = inspectionProduct.getInternal();//鍐呮帶鍊�
+ inspectionProduct.setTestValue(value);
+ inspectionProduct.setTestState(checkValues(required, internal, value));
+ inspectionProductMapper.updateById(inspectionProduct);
+ } else {
+ //濡傛灉妫�楠屽�间负绌�,灏嗗師鏈夌殑妫�楠岀粨璁鸿鐩栦负null
+ inspectionProductMapper.upda(id);
+ }
+ return "鎻愪氦鎴愬姛!";
+ }
+
+ //涓婃姤
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public String reported(Integer id) {
+ /*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
+ //鍏堝垽鏂楠岀粨鏋�
+ List<Integer> results = inspectionProductMapper.getresult(id);
+ int count = 0;
+ for (Integer result : results) {
+ if (result != null && result==1) {
+ count++;
+ }
+ }
+ //濡傛灉妫�楠岄」鐩腑鐨勭粨璁哄寘鍚笉鍚堟牸鍒欐楠屽崟涓嶅悎鏍�
+ if (results.contains(0)) {
+ Inspection inspection = new Inspection();
+ inspection.setId(id);
+ inspection.setInspectionStatus(0);
+ inspectionMapper.updateById(inspection);
+ } else if (count == results.size()) {
+ Inspection inspection = new Inspection();
+ inspection.setId(id);
+ inspection.setInspectionStatus(1);
+ inspectionMapper.updateById(inspection);
+ } else return "椤圭洰鏈楠屽畬!";
+ //鐢熸垚鎶ュ憡鍗�
+ Report report = new Report();
+ //鐢熸垚鎶ュ憡鍗曞彿
+ String recode = MyUtil.getTimeSixNumberCode("BG", "BG");
+ //鑾峰彇妫�楠岀粨璁�
+ String conclusion = "";
+ Inspection inspection = inspectionMapper.selectById(id);
+ if (inspection.getInspectionStatus().equals(1)) {
+ conclusion = "鍚堟牸";
+ } else {
+ conclusion = "涓嶅悎鏍�";
+ }
+ report.setCode(recode);
+ report.setStatus(0);
+ report.setConclusion(conclusion);
+ report.setInspectionId(id);
+ reportMapper.insert(report);
+ return "涓婃姤鎴愬姛!";
+ }
+
+
+ /*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
+ 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/RawMaterialServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
index 7b93cf3..de3cc31 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,24 +1,15 @@
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;
/**
@@ -37,7 +28,6 @@
/**
* 鍒嗛〉鏌ヨ
- *
* @param materialCoding
* @param materialName
* @param condition
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java
deleted file mode 100644
index df8e8e4..0000000
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportAuditingServiceImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.yuanchu.limslaboratory.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.limslaboratory.mapper.ReportMapper;
-import com.yuanchu.limslaboratory.pojo.Report;
-import com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo;
-import com.yuanchu.limslaboratory.service.ReportAuditingService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-08-07
- */
-@Service
-public class ReportAuditingServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportAuditingService {
-
- @Resource
- private ReportMapper reportMapper;
-
- /**
- * 椤圭洰瀹℃牳琛ㄦ煡璇�
- * @return
- */
- @Override
- public IPage<ReportAuditingVo> selectAllReportAuditing(Page<Object> page, Integer status, String name) {
- return reportMapper.selectAllReportAuditing(page, status, name);
- }
-}
-
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
index 702f2ae..dec4ee1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
@@ -7,10 +7,9 @@
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
+import java.util.Date;
/**
* <p>
@@ -35,5 +34,40 @@
return reportMapper.selectAllReport(page, status, name);
}
+ //鎻愪氦
+ @Override
+ public String submit(Integer id) {
+ Report report = new Report();
+ report.setId(id);
+ report.setStatus(1);
+ reportMapper.updateById(report);
+ return "鎻愪氦鎴愬姛!";
+ }
+
+ //瀹℃牳
+ @Override
+ public String check(String name, Integer id, String result) {
+ Report report = new Report();
+ report.setId(id);
+ report.setApprover(name);
+ report.setCheckTime(new Date());
+ if (result.equals("閫氳繃")){
+ report.setStatus(2);
+ }else if (result.equals("涓嶉�氳繃")){
+ report.setStatus(3);
+ }
+ reportMapper.updateById(report);
+ return "瀹℃牳鎴愬姛!";
+ }
+
+ @Override
+ public String delreport(Integer id) {
+ Report report = new Report();
+ report.setId(id);
+ report.setState(0);
+ reportMapper.updateById(report);
+ return "鍒犻櫎鎴愬姛!";
+ }
+
}
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..594632c
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml
@@ -0,0 +1,24 @@
+<?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">
+ <update id="upda">
+ update lims_laboratory.inspection_product
+ set test_state=null
+ where id = #{id}
+ and state = 1
+ </update>
+
+ <!--鏍规嵁妫�楠屽崟id鏌ヨ妫�楠岄」鐩殑妫�楠岀粨鏋�-->
+ <select id="getresult" resultType="java.lang.Integer">
+ select test_state
+ from lims_laboratory.inspection_product
+ where state = 1
+ and inspection_material_id = (select id from lims_laboratory.inspection_material where inspection_id = #{id})
+ </select>
+ <!--鏍规嵁妫�楠屾牱鍝乮d浣滃簾妫�楠岄」鐩�-->
+ <update id="updat">
+ update lims_laboratory.inspection_product
+ set state=0
+ where inspection_material_id=#{id}
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index 16f3557..8b9eba4 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.PlanMapper">
- <resultMap id="selectAllPlanMap" type="map" >
+ <resultMap id="selectAllPlanMap" type="map">
<id property="code" column="code"/>
+ <result property="id" column="id"/>
<result property="inspectionStatus" column="inspectionStatus"/>
<result property="startTime" column="startTime"/>
<result property="endTime" column="endTime"/>
@@ -13,7 +14,7 @@
<collection property="chldren" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
</resultMap>
<resultMap id="selectAllPlanMapTowsMap" type="map">
- <id property="id" column="id"/>
+ <id property="pid" column="pid"/>
<result property="name" column="name"/>
<result property="unit" column="unit"/>
<result property="required" column="required"/>
@@ -24,12 +25,13 @@
</resultMap>
<!--鏌ヨ妫�楠岃鍒�-->
<select id="selectAllPlan" resultMap="selectAllPlanMap">
- select ip.id,
+ select i.id ,
i.code,
inspection_status inspectionStatus,
DATE_FORMAT(start_time,'%Y-%m-%d') startTime,
DATE_FORMAT(end_time,'%Y-%m-%d') endTime,
im.name samplename,
+ ip.id pid,
ip.name,
ip.unit,
required,
@@ -41,7 +43,7 @@
left join lims_laboratory.inspection_material im on ip.inspection_material_id = im.id
left join lims_laboratory.inspection i on im.inspection_id = i.id
left join lims_laboratory.user u on ip.user_id = u.id
- left join lims_laboratory.instrument isu on ip.instrument_id = isu.id
+ left join lims_laboratory.instrument isu on ip.instrument_id = isu.id
<where>
<if test="code != null and code != null">
and i.code like concat('%',#{code},'%')
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 708ac38..7634937 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -4,17 +4,20 @@
<!--鏌ヨ妫�楠屾姤鍛�-->
<select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">
- select im.code materialCode,
+ select r.id,
+ im.code materialCode,
r.code reportCode,
i.code inspectionCode,
- r.approver approver,
- r.status status,
- r.conclusion conclusion,
- u.name name
- from report r
- join inspection i on r.inspection_id = i.id
- join user u on i.user_id = u.id
- join inspection_material im on i.id = im.inspection_id
+ im.name materialName,
+ r.conclusion ,
+ r.status ,
+ r.approver ,
+ check_time,
+ u.name
+ from lims_laboratory.report r
+ join lims_laboratory.inspection i on r.inspection_id = i.id
+ join lims_laboratory.user u on i.user_id = u.id
+ join lims_laboratory.inspection_material im on i.id = im.inspection_id
<where>
r.state = 1
<if test="status != null">
@@ -26,33 +29,7 @@
or r.code like concat('%', #{name}, '%')
</if>
</where>
+ order by r.id
</select>
- <!--鏌ヨ鎶ュ憡瀹℃牳-->
- <select id="selectAllReportAuditing" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo">
- select im.code materialCode,
- r.code reportCode,
- im.name materialName,
- r.status status,
- r.approver approver,
- DATE_FORMAT(r.`create_time`, '%Y-%m-%d') submitTime,
- DATE_FORMAT(r.`check_time`, '%Y-%m-%d') checkTime
- from report r
- join inspection i on r.inspection_id = i.id
- join inspection_material im on i.id = im.inspection_id
- <where>
- r.state = 1
- <if test="status == null">
- and r.status in (0, 1)
- </if>
- <if test="status != null">
- and r.status = #{status}
- </if>
- <if test="name != null and name != ''">
- and im.code like concat('%', #{name}, '%')
- or i.code like concat('%', #{name}, '%')
- or im.name like concat('%', #{name}, '%')
- </if>
- </where>
- </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 2af36d3..dba7af0 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
@@ -23,5 +23,6 @@
IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);
-
+ //鍒嗛厤-->閫夋嫨璁惧
+ List<Map<String, Object>> chooseinstum();
}
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 3dcab6f..98a6181 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -1,18 +1,19 @@
<?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.InstrumentMapper">
-
<select id="getListInstrumentInformation" resultType="map">
SELECT i.`id`, i.`equipment_code`, i.`equipment_name`, i.`specifications_models`, u.`name`,
- DATE_FORMAT(DATE_ADD(i.`create_time`, INTERVAL i.`term_validity` MONTH), '%Y-%m-%d') termValidity, i.`conditions`, i.`storage_place`
+ DATE_FORMAT(DATE_ADD(i.`create_time`, INTERVAL i.`term_validity` MONTH), '%Y-%m-%d') termValidity,
+ i.`conditions`, i.`storage_place`
FROM instrument i, `user` u
WHERE i.`state` = 1
- AND i.`classify_id` = #{classifyId}
+ AND i.`classify_id` = #{classifyId}
<if test="conditions != null">
AND i.`conditions` = #{conditions}
</if>
<if test="numberOrNameOrSpecifications != null and numberOrNameOrSpecifications != ''">
- AND CONCAT(i.`equipment_code`, i.`equipment_name`, i.`specifications_models`) LIKE CONCAT('%',#{numberOrNameOrSpecifications},'%')
+ AND CONCAT(i.`equipment_code`, i.`equipment_name`, i.`specifications_models`) LIKE
+ CONCAT('%',#{numberOrNameOrSpecifications},'%')
</if>
<if test="whetherWhether == true">
AND DATE_FORMAT(DATE_ADD(i.`create_time`, INTERVAL i.`term_validity` MONTH), '%Y-%m-%d') <![CDATA[<]]> NOW()
@@ -20,4 +21,25 @@
AND i.`user_id` = u.`id`
</select>
+ <!--閫夋嫨璁惧-->
+ <resultMap id="chooseinstumMap" type="map">
+ <id property="father_name" column="father_name"/>
+ <collection property="father" resultMap="chooseinstumTowMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="chooseinstumTowMap" type="map">
+ <id property="son_name" column="son_name"/>
+ <collection property="chldren" resultMap="chooseinstumTowsMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="chooseinstumTowsMap" type="map">
+ <id property="id" column="id"/>
+ <result property="name" column="name"/>
+ </resultMap>
+ <select id="chooseinstum" resultMap="chooseinstumMap">
+ select instrument.id,
+ father_name,
+ son_name,
+ equipment_name name
+ from lims_laboratory.instrument
+ left join lims_laboratory.classify c on c.id = instrument.classify_id
+ </select>
</mapper>
--
Gitblit v1.9.3