From cf347859a3a023f48bdb82e7702c0df8858759db Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期四, 10 八月 2023 13:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformingFeedbackServiceImpl.java | 34 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java | 35 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/NonConformanceReviewMapper.java | 20 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NonConformanceReviewVo.java | 30 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/NonConformingFeedbackMapper.java | 24 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java | 44 ++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 11
standard-server/src/main/resources/mapper/MaterialMapper.xml | 26 +-
sys/src/main/resources/application-dev.yml | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/NonConformanceReviewController.java | 35 +++
inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml | 35 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/NonConformingFeedbackController.java | 35 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java | 102 ++++++++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/NonConformanceReviewService.java | 20 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java | 53 +++++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/NonConformingFeedbackService.java | 19 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NonConformingFeedbackVo.java | 32 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformanceReviewDto.java | 37 +++
18 files changed, 577 insertions(+), 17 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 5b01d22..027e223 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
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.service.InspectionService;
+
import javax.annotation.Resource;
/**
@@ -67,13 +68,13 @@
@GetMapping("/selectAll")
public Result selectAll(Integer type) {
switch (type) {
- case 0 :
+ case 0:
//鍘熸潗鏂�
return Result.success(rawMaterialService.selectRawmaAll());
- case 1 :
+ case 1:
//濮旀墭鍗�
return Result.success(linkBasicInformationService.selectLinkAll());
- case 2 :
+ case 2:
//鎴愬搧妫�楠�
return Result.success("璇疯緭鍏ユ楠屼俊鎭�!");
}
@@ -89,7 +90,7 @@
})
@GetMapping("/selectRawmaById")
public Result selectRawmaById(Integer id, String startTime, String endTime) throws ParseException {
- return Result.success(rawMaterialService.selectRawmaById(id,startTime,endTime));
+ return Result.success(rawMaterialService.selectRawmaById(id, startTime, endTime));
}
@@ -98,6 +99,8 @@
@ApiImplicitParam(name = "bid", value = "濮旀墭鎶ユ鍗昳d", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "did", value = "濮旀墭鎶ユ鏍峰搧id", dataTypeClass = Integer.class, required = true)
})
+
+
@GetMapping("/selectLinkByid")
public Result selectLinkByid(Integer bid, Integer did) {
return Result.success(linkBasicInformationService.selectLinkByid(bid, did));
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/NonConformanceReviewController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/NonConformanceReviewController.java
new file mode 100644
index 0000000..4f05322
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/NonConformanceReviewController.java
@@ -0,0 +1,35 @@
+package com.yuanchu.limslaboratory.controller;
+
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
+import com.yuanchu.limslaboratory.pojo.NonConformanceReview;
+import com.yuanchu.limslaboratory.pojo.vo.NonConformanceReviewVo;
+import com.yuanchu.limslaboratory.service.NonConformanceReviewService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+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;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Api(tags = "璇曢獙绠＄悊-->涓嶅悎鏍煎搧璇勫")
+@RestController
+@RequestMapping("/nonConformanceReview")
+public class NonConformanceReviewController {
+
+ @Resource
+ private NonConformanceReviewService service;
+
+
+ @GetMapping("/getNonConformanceReview")
+ @ApiOperation("涓嶅悎鏍煎搧鍙嶉-->鑾峰彇涓嶅悎鏍煎搧璇勫淇℃伅")
+ public Result<NonConformanceReviewVo> getNonConformanceReview(NonConformingFeedbackDto nonConformingFeedbackDto){
+
+ return Result.success(service.getNonConformanceReviewVo(nonConformingFeedbackDto));
+ }
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/NonConformingFeedbackController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/NonConformingFeedbackController.java
new file mode 100644
index 0000000..2b4c81a
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/NonConformingFeedbackController.java
@@ -0,0 +1,35 @@
+package com.yuanchu.limslaboratory.controller;
+
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
+import com.yuanchu.limslaboratory.pojo.NonConformingFeedback;
+import com.yuanchu.limslaboratory.pojo.vo.NonConformingFeedbackVo;
+import com.yuanchu.limslaboratory.service.NonConformingFeedbackService;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+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;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Api(tags = "璇曢獙绠＄悊-->涓嶅悎鏍煎搧鍙嶉")
+@RestController
+@RequestMapping("/non-conforming-feedback")
+public class NonConformingFeedbackController {
+
+ @Resource
+ private NonConformingFeedbackService service;
+
+ @GetMapping("/getNonConformingFeedback")
+ @ApiOperation("涓嶅悎鏍煎搧鍙嶉-->鑾峰彇涓嶅悎鏍煎搧淇℃伅")
+ public Result<NonConformingFeedbackVo> getNonConformingFeedback(NonConformingFeedbackDto nonConformingFeedbackDto){
+ return Result.success(service.getNonConformingFeedback(nonConformingFeedbackDto));
+ }
+
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/NonConformanceReviewMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/NonConformanceReviewMapper.java
new file mode 100644
index 0000000..a64d101
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/NonConformanceReviewMapper.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformanceReviewDto;
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
+import com.yuanchu.limslaboratory.pojo.NonConformanceReview;
+import com.yuanchu.limslaboratory.pojo.NonConformingFeedback;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Repository
+public interface NonConformanceReviewMapper extends BaseMapper<NonConformanceReview> {
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/NonConformingFeedbackMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/NonConformingFeedbackMapper.java
new file mode 100644
index 0000000..3080ae6
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/NonConformingFeedbackMapper.java
@@ -0,0 +1,24 @@
+package com.yuanchu.limslaboratory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mybatis_config.MyBaseMapper;
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
+import com.yuanchu.limslaboratory.pojo.LinkDetection;
+import com.yuanchu.limslaboratory.pojo.NonConformingFeedback;
+import com.yuanchu.limslaboratory.pojo.RawMaterial;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Objects;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Repository
+public interface NonConformingFeedbackMapper extends BaseMapper<NonConformingFeedback> {
+
+ IPage<NonConformingFeedback> selectNonConformingFeedback(@Param("nonConformingFeedbackDto") NonConformingFeedbackDto nonConformingFeedbackDto, Page page);
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformanceReviewDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformanceReviewDto.java
new file mode 100644
index 0000000..9abeff1
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformanceReviewDto.java
@@ -0,0 +1,37 @@
+package com.yuanchu.limslaboratory.pojo.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="NonConformanceReviewDto瀵硅薄", description="")
+public class NonConformanceReviewDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "褰撳墠椤�", example = "1", required = true)
+ private Long currentPage;
+
+ @ApiModelProperty(value = "鍒嗛〉澶氬皯鏉�", example = "10", required = true)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "鏍峰搧缂栧彿", example = "1680929494813868034", required = true)
+ private String materialCode;
+
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О", example = "鐢电嚎鐢电紗", required = true)
+ private String materialName;
+
+ @ApiModelProperty(value = "鐢宠鍗曞彿", example = "XG-UGYUGH", required = true)
+ private String inspectionCode;
+
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java
new file mode 100644
index 0000000..5ed3e80
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Dto/NonConformingFeedbackDto.java
@@ -0,0 +1,35 @@
+package com.yuanchu.limslaboratory.pojo.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="NonConformingFeedbackDto瀵硅薄", description="")
+public class NonConformingFeedbackDto implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "褰撳墠椤�", example = "1", required = true)
+ private Long currentPage;
+
+ @ApiModelProperty(value = "鍒嗛〉澶氬皯鏉�", example = "10", required = true)
+ private Long pageNum;
+
+ @ApiModelProperty(value = "鏍峰搧缂栧彿", example = "1680929494813868034", required = true)
+ private String materialCode;
+
+ @ApiModelProperty(value = "鏍峰搧鍚嶇О", example = "鐢电嚎鐢电紗", required = true)
+ private String materialName;
+
+ @ApiModelProperty(value = "鐢宠鍗曞彿", example = "XG-UGYUGH", required = true)
+ private String inspectionCode;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java
new file mode 100644
index 0000000..fa2e0bf
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformanceReview.java
@@ -0,0 +1,102 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.sql.Date;
+import java.time.LocalDateTime;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="涓嶇鍚堝搧璇勫瀵硅薄", description="")
+@TableName("tb_non_conformance_review")
+public class NonConformanceReview implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(type =IdType.ASSIGN_ID)
+ private Long id;
+
+ /**
+ * 鏍峰搧缂栧彿
+ */
+ private String materialCode;
+
+ /**
+ * 鏍峰搧鍚嶇О
+ */
+ private String materialName;
+
+ /**
+ * 鐢宠鍗曞彿
+ */
+ private String inspectionCode;
+
+ /**
+ * 鐧昏鏃ユ湡
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 瀹為獙璐熻矗浜�
+ */
+ private String testManager;
+
+ /**
+ * 瑙勬牸鍨嬪彿
+ */
+ private String specifications;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ private String createdUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private LocalDateTime createdTime;
+
+ /**
+ * 淇敼浜�
+ */
+ private String updatedUser;
+
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private LocalDateTime updatedTime;
+
+ /**
+ * 閫昏緫鍒犻櫎
+ */
+ @TableLogic(value = "1")
+ private Integer state;
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java
new file mode 100644
index 0000000..845460b
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/NonConformingFeedback.java
@@ -0,0 +1,53 @@
+package com.yuanchu.limslaboratory.pojo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.sql.Date;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class NonConformingFeedback implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鏍峰搧缂栧彿
+ */
+ private String materialCode;
+
+ /**
+ * 鏍峰搧鍚嶇О
+ */
+ private String materialName;
+
+ /**
+ * 鐢宠鍗曞彿
+ */
+ private String inspectionCode;
+
+ /**
+ * 鐧昏鏃ユ湡
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime;
+
+ /**
+ * 瀹為獙璐熻矗浜�
+ */
+ private String testManager;
+
+ /**
+ * 瑙勬牸鍨嬪彿
+ */
+ private String specifications;
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NonConformanceReviewVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NonConformanceReviewVo.java
new file mode 100644
index 0000000..a7c8646
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NonConformanceReviewVo.java
@@ -0,0 +1,30 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.yuanchu.limslaboratory.pojo.NonConformanceReview;
+import com.yuanchu.limslaboratory.pojo.NonConformingFeedback;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Data
+public class NonConformanceReviewVo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @JsonSerialize
+ private List<NonConformanceReview> nonConformanceReviewList;
+
+ @JsonSerialize
+ private Long total;
+
+ public NonConformanceReviewVo(List<NonConformanceReview> nonConformanceReviewList, Long total) {
+ this.nonConformanceReviewList = nonConformanceReviewList;
+ this.total = total;
+ }
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NonConformingFeedbackVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NonConformingFeedbackVo.java
new file mode 100644
index 0000000..f4d337d
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NonConformingFeedbackVo.java
@@ -0,0 +1,32 @@
+package com.yuanchu.limslaboratory.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterial;
+import com.yuanchu.limslaboratory.pojo.NonConformingFeedback;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Data
+public class NonConformingFeedbackVo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @JsonSerialize
+ private List<NonConformingFeedback> nonConformingFeedbackList;
+
+ @JsonSerialize
+ private Long total;
+
+ public NonConformingFeedbackVo(List<NonConformingFeedback> nonConformingFeedbackList, Long total) {
+ this.nonConformingFeedbackList = nonConformingFeedbackList;
+ this.total = total;
+ }
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/NonConformanceReviewService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/NonConformanceReviewService.java
new file mode 100644
index 0000000..20fd16b
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/NonConformanceReviewService.java
@@ -0,0 +1,20 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
+import com.yuanchu.limslaboratory.pojo.vo.NonConformanceReviewVo;
+import com.yuanchu.limslaboratory.pojo.vo.NonConformingFeedbackVo;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+public interface NonConformanceReviewService {
+
+ /**
+ * 寰楀埌涓嶅悎鏍煎搧鎻愪氦淇℃伅
+ * @param nonConformingFeedbackDto
+ * @return
+ */
+ NonConformanceReviewVo getNonConformanceReviewVo(NonConformingFeedbackDto nonConformingFeedbackDto);
+
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/NonConformingFeedbackService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/NonConformingFeedbackService.java
new file mode 100644
index 0000000..761b0f5
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/NonConformingFeedbackService.java
@@ -0,0 +1,19 @@
+package com.yuanchu.limslaboratory.service;
+
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
+import com.yuanchu.limslaboratory.pojo.vo.NonConformingFeedbackVo;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+public interface NonConformingFeedbackService {
+
+ /**
+ * 寰楀埌涓嶅悎鏍煎搧鍙嶉淇℃伅
+ * @param nonConformingFeedbackDto
+ * @return
+ */
+ NonConformingFeedbackVo getNonConformingFeedback(NonConformingFeedbackDto nonConformingFeedbackDto);
+
+}
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
new file mode 100644
index 0000000..99ac92f
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformanceReviewServiceImpl.java
@@ -0,0 +1,44 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.NonConformanceReviewMapper;
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
+import com.yuanchu.limslaboratory.pojo.NonConformanceReview;
+import com.yuanchu.limslaboratory.pojo.NonConformingFeedback;
+import com.yuanchu.limslaboratory.pojo.vo.NonConformanceReviewVo;
+import com.yuanchu.limslaboratory.service.NonConformanceReviewService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Service
+public class NonConformanceReviewServiceImpl implements NonConformanceReviewService {
+
+ @Resource
+ private NonConformanceReviewMapper mapper;
+
+ @Override
+ public NonConformanceReviewVo getNonConformanceReviewVo(NonConformingFeedbackDto nonConformingFeedbackDto) {
+ QueryWrapper<NonConformanceReview>queryWrapper= new QueryWrapper<>();
+ if (StringUtils.hasText(nonConformingFeedbackDto.getMaterialCode())){
+ queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getMaterialCode,nonConformingFeedbackDto.getMaterialCode()));
+ }
+ if (StringUtils.hasText(nonConformingFeedbackDto.getMaterialName())){
+ queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getMaterialName,nonConformingFeedbackDto.getMaterialName()));
+ }
+ if (StringUtils.hasText(nonConformingFeedbackDto.getInspectionCode())){
+ queryWrapper.lambda().and(a->a.eq(NonConformanceReview::getInspectionCode,nonConformingFeedbackDto.getInspectionCode()));
+ }
+ Page<NonConformanceReview> page = new Page<>(nonConformingFeedbackDto.getCurrentPage(), nonConformingFeedbackDto.getPageNum(), true);
+ IPage<NonConformanceReview> iPage = mapper.selectPage(page, queryWrapper);
+ return new NonConformanceReviewVo(iPage.getRecords(),iPage.getTotal());
+ }
+}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformingFeedbackServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformingFeedbackServiceImpl.java
new file mode 100644
index 0000000..7d6fc23
--- /dev/null
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/NonConformingFeedbackServiceImpl.java
@@ -0,0 +1,34 @@
+package com.yuanchu.limslaboratory.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.mapper.NonConformingFeedbackMapper;
+import com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto;
+import com.yuanchu.limslaboratory.pojo.NonConformingFeedback;
+import com.yuanchu.limslaboratory.pojo.vo.NonConformingFeedbackVo;
+import com.yuanchu.limslaboratory.service.NonConformingFeedbackService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author 寮犲
+ * @Date 2023/8/9
+ */
+@Service
+public class NonConformingFeedbackServiceImpl implements NonConformingFeedbackService {
+
+ @Resource
+ private NonConformingFeedbackMapper mapper;
+
+ @Override
+ public NonConformingFeedbackVo getNonConformingFeedback(NonConformingFeedbackDto nonConformingFeedbackDto) {
+ Page<Object> page = new Page<>(nonConformingFeedbackDto.getCurrentPage(), nonConformingFeedbackDto.getPageNum(), true);
+ IPage<NonConformingFeedback> iPage = mapper.selectNonConformingFeedback(nonConformingFeedbackDto, page);
+ return new NonConformingFeedbackVo(iPage.getRecords(),iPage.getTotal());
+ }
+
+
+
+
+}
diff --git a/inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml b/inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml
new file mode 100644
index 0000000..2fb25ac
--- /dev/null
+++ b/inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml
@@ -0,0 +1,35 @@
+<?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.NonConformingFeedbackMapper">
+
+ <select id="selectNonConformingFeedback" resultType="nonConformingFeedback" parameterType="com.yuanchu.limslaboratory.pojo.Dto.NonConformingFeedbackDto">
+ SELECT
+ im.`code` materialCode,
+ im.`name` materialName,
+ i.`code` inspectionCode,
+ i.create_time createTime,
+ u.`name` testManager,
+ im.specifications specifications
+ FROM
+ inspection i,
+ inspection_material im,
+ `user` u
+ WHERE
+ 1 = 1
+ AND i.id = im.inspection_id
+ AND i.user_id = u.id
+ <if test="nonConformingFeedbackDto.materialCode!=null and nonConformingFeedbackDto.materialCode!=''">
+ and im.`code` like concat("%",#{nonConformingFeedbackDto.materialCode},"%")
+ </if>
+ <if test="nonConformingFeedbackDto.materialName!=null and nonConformingFeedbackDto.materialName!=''">
+ and im.`name` like concat("%",#{nonConformingFeedbackDto.materialName},"%")
+ </if>
+ <if test="nonConformingFeedbackDto.inspectionCode!=null and nonConformingFeedbackDto.inspectionCode!=''">
+ and im.specifications like concat("%",#{nonConformingFeedbackDto.inspectionCode},"%")
+ </if>
+ and i.state=1
+ and im.state=1
+ and i.inspection_status =0
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/standard-server/src/main/resources/mapper/MaterialMapper.xml b/standard-server/src/main/resources/mapper/MaterialMapper.xml
index 661b8fd..8ff48cb 100644
--- a/standard-server/src/main/resources/mapper/MaterialMapper.xml
+++ b/standard-server/src/main/resources/mapper/MaterialMapper.xml
@@ -3,12 +3,12 @@
<mapper namespace="com.yuanchu.limslaboratory.mapper.MaterialMapper">
<select id="selectMaterialLimit" resultType="Map">
- select id,code, name
+ select id, code, name
from lims_laboratory.material
where state = 1
- and type = #{type}
+ and type = #{type}
order by create_time desc
- limit #{num1},#{num2}
+ limit #{num1}, #{num2}
</select>
<select id="selectMaterialById" resultType="Map">
select m.id,
@@ -28,7 +28,7 @@
lims_laboratory.serial_number sn
where m.specifications_id = s.id
and s.serial_id = sn.id
- and m.id=#{materialId}
+ and m.id = #{materialId}
</select>
<resultMap id="OneLevelTreeMap" type="Map">
@@ -56,15 +56,17 @@
<select id="FourTree" resultMap="OneLevelTreeMap">
SELECT m.`id` materialId, m.`name` materialName, s.`id` standardId, s.`name` standardName,
- f.`id` specificationsId, f.`name` specificationsName, p.`id` productId, p.`name` productName
+ f.`id` specificationsId, f.`name` specificationsName, p.`id` productId, p.`name` productName
FROM material m
- LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s ON m.id = s.`material_id`
- LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1
- <if test="specificationsName != null and specificationsName != ''">
- AND f.`name` = #{specificationsName}
- </if>
- ) f ON s.`id` = f.`standard_id`
- LEFT JOIN (SELECT p.`id`, p.`name`, p.`specifications_id` FROM product p WHERE p.`state` = 1) p ON f.`id` = p.`specifications_id`
+ LEFT JOIN (SELECT s.`id`, s.`name`, s.`material_id` FROM standard s WHERE s.`state` = 1) s ON m.id =
+ s.`material_id`
+ LEFT JOIN (SELECT f.`id`, f.`name`, f.`standard_id` FROM specifications f WHERE f.`state` = 1
+ <if test="specificationsName != null and specificationsName != ''">
+ AND f.`name` = #{specificationsName}
+ </if>
+ ) f ON s.`id` = f.`standard_id`
+ LEFT JOIN (SELECT p.`id`, p.`name`, p.`specifications_id` FROM product p WHERE p.`state` = 1) p ON f.`id` =
+ p.`specifications_id`
WHERE m.`state` = 1
</select>
</mapper>
diff --git a/sys/src/main/resources/application-dev.yml b/sys/src/main/resources/application-dev.yml
index 559d340..c84fc36 100644
--- a/sys/src/main/resources/application-dev.yml
+++ b/sys/src/main/resources/application-dev.yml
@@ -67,7 +67,7 @@
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
host: localhost
# redis绔彛锛堥粯璁や负6379锛�
- port: 6380
+ port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
password: null
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
--
Gitblit v1.9.3