From e5ddbd2fd218430ef282732843ca979914bcc133 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 31 Mar 2024 22:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/thrsys/ThrProductsEntity.java  |  4 +--
 .../req/thrsys/FilterThrProductsRequest.java  | 16 ++++++++-
 .../mybatis/mapper/thrsys/ThrProductsDao.xml  | 34 +++++++++----------
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java
index ca7d5d8f..604a0560 100644
--- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java
+++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java
@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @Data
 @TableName("thr_products")
-public class ThrProductsEntity{
+public class ThrProductsEntity {
 
     @TableId(value = "id", type = IdType.INPUT)
     private Long id;
@@ -180,6 +180,4 @@ public class ThrProductsEntity{
     private String updateUser;
 
 
-
-
 }
diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java
index 79fc4b96..cd293f98 100644
--- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java
+++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java
@@ -1,6 +1,7 @@
 package com.glxp.api.req.thrsys;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
@@ -25,7 +26,20 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private String companyName;
     private Boolean isDownThrSys;
     private Integer status;
-
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
+
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
 
     private List<String> codes;
     private Integer checkStatus;
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
index ff79fd5e..3f29b0b3 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
@@ -76,23 +76,21 @@
                 AND spec = #{spec}
             </if>
             <if test="unionCode != '' and unionCode != null">
-                or code LIKE = #{unionCode}
-                or sptm = #{unionCode}
-                or ybbm LIKE
-                       = #{unionCode}
+                or code LIKE #{unionCode}
+                or sptm LIKE #{unionCode}
+                or ybbm LIKE #{unionCode}
             </if>
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
             </if>
-            <if test="thirdSys != '' and thirdSys != null">
-                AND thirdSys = #{thirdSys}
-            </if>
             <if test="supName != '' and supName != null">
-                AND supName LIKE = #{supName}
+                AND supName LIKE #{supName}
             </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
-                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                and DATE_FORMAT(updateTime
+                            , '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}
+                            , '%Y-%m-%d %H:%i:%S')
                 ]]>
             </if>
         </where>
@@ -166,12 +164,13 @@
     <insert id="insertThrProducts" keyProperty="id"
             parameterType="com.glxp.api.entity.thrsys.ThrProductsEntity">
         replace
-            INTO thr_products
-        (id,code, `name`, measname, spec, registerNo, manufactory,
-         cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
-         thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3, price,
-         createUser, createTime, updateUser)
-        values (  #{id},
+                INTO thr_products
+                (id, code, `name`, measname, spec, registerNo, manufactory,
+                 cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
+                 thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,
+                 price,
+                 createUser, createTime, updateUser)
+        values (#{id},
                 #{code},
                 #{name},
                 #{measname},
@@ -349,12 +348,11 @@
     <select id="filterThrProductsByMainId" resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
         SELECT *
         FROM thr_products
-        LEFT JOIN basic_udirel  ON thr_products.id = basic_udirel.mainId
+                     LEFT JOIN basic_udirel ON thr_products.id = basic_udirel.mainId
         <where>
             <if test="relId != '' and relId != null">
-                AND basic_udirel.id  = #{relId}
+                AND basic_udirel.id = #{relId}
             </if>
         </where>
     </select>
-
 </mapper>