From 9ddb32175b3624ba3a3cedbfc009d9d526391a20 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 11:54:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-after

---
 inspection-server/src/main/resources/mapper/NonConformingFeedbackMapper.xml |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

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

--
Gitblit v1.9.3