From b5c1f907eba587a0c4225e52d6286dc5986201d1 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 10 Aug 2023 11:14:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A1=E6=A3=80=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java   | 3 ++-
 .../resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java
index 240f2a381..4e0e3c3ba 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java
@@ -1,6 +1,5 @@
 package com.glxp.api.req.inv;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
@@ -64,6 +63,8 @@ public class FilterDeviceInspectTakeRequest extends ListPageRequest {
 
     private Integer repairType;
 
+    private Integer type;
+
 
 
 
diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml
index 78e2a0b5a..0d40e5067 100644
--- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml
+++ b/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml
@@ -71,6 +71,9 @@
       <if test="level != null">
         AND t.level = #{level}
       </if>
+      <if test="type != null">
+        AND t.type = #{type}
+      </if>
       <if test="repairType != null">
         AND t.repairType = #{repairType}
       </if>

From 6cac80437bd9f28f1ebb7d89fde11840fa6eb1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Thu, 10 Aug 2023 17:35:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E2=80=98DI/=E7=89=A9=E8=B5=84=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E2=80=99=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E6=9C=89?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/mapper/purchase/PurApplyDetailDao.xml    | 1 +
 .../resources/mybatis/mapper/purchase/PurOrderDetailDao.xml    | 1 +
 .../resources/mybatis/mapper/purchase/PurPlanDetailDao.xml     | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
index f40d69dae..f0ec81f00 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
@@ -121,6 +121,7 @@
         SELECT pur_apply_detail.*,
                pur_apply.billNo,
                basic_products.ggxh spec,
+               basic_products.nameCode,
                basic_products.measname,
                basic_products.manufactory,
                basic_products.ylqxzcrbarmc,
diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
index fc9c249b9..d9a614695 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml
@@ -139,6 +139,7 @@
     <select id="selectDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
         SELECT pur_order_detail.*,
                pur_order.billNo,
+               basic_products.nameCode,
                basic_products.ggxh spec,
                basic_products.measname,
                basic_products.manufactory,
diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml
index f79f68c0f..531f386fa 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDetailDao.xml
@@ -137,6 +137,7 @@
         pur_plan.billNo,
         basic_products.ggxh spec,
         basic_products.measname,
+        basic_products.nameCode,
         basic_products.manufactory,
         basic_products.ylqxzcrbarmc,
         basic_corp.`name` supName
@@ -174,4 +175,4 @@
               and pur_plan.status=3
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>