From 942fd08345fe0f3b04b4a0e919516257213ad2e5 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期一, 20 十一月 2023 15:59:51 +0800
Subject: [PATCH] 20231120_qiuyh_区域巡检打卡、防患举报、物料web端
---
hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
index 2cf6e2c..c85c199 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
@@ -102,7 +102,7 @@
on duplicate key update
<trim suffixOverrides=",">
<if test="nameOfOrigin != null">
- name_of_origin = #{nameOfOrigin,jdbcType=VARCHAR},
+ name_of_origin = #{nameOfOrigin,jdbcType=VARCHAR},
</if>
<if test="tableNum != null">
table_num = #{tableNum,jdbcType=INTEGER},
@@ -132,7 +132,7 @@
update_user= #{updateUser,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
- update_time #{updateTime,jdbcType=TIMESTAMP},
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=VARCHAR},
@@ -147,7 +147,7 @@
</insert>
<delete id="delete">
- update t_su_material_warehouse set isUse = 0 where id = #{id,jdbcType=VARCHAR}
+ update t_su_material_warehouse_record set is_use = 0 where id = #{id,jdbcType=VARCHAR}
</delete>
<select id="selectPageList" resultType="com.thhy.materials.modules.biz.suMaterialWarehouse.entity.SuMaterialWarehouseEntity">
@@ -155,7 +155,7 @@
t.id AS id,
t.name_of_origin AS nameOfOrigin,
t.table_num AS tableNum,
- sd.dict_name AS materialName,
+ t.material_name AS materialName,
t.incoming_quantity AS incomingQuantity,
t.create_time AS createTime,
t.status AS status,
@@ -171,6 +171,15 @@
LEFT JOIN sys_users su1 on su1.user_id = t.update_user
LEFT JOIN sys_dict sd on sd.dict_id = t.material_name
where t.is_use = 1 and t.company_id = #{companyId}
+ <if test="tableNum != null and tableNum !=''">
+ and t.table_num = #{tableNum}
+ </if>
+ <if test="type != null and type !=''">
+ and t.type = #{type}
+ </if>
+ <if test="startTime != null and endTime != null">
+ and t.create_time between #{startTime} and #{endTime}
+ </if>
order by t.create_time desc
</select>
@@ -180,7 +189,7 @@
t.id AS id,
t.name_of_origin AS nameOfOrigin,
t.table_num AS tableNum,
- sd.dict_name AS materialName,
+ t.material_name AS materialName,
t.incoming_quantity AS incomingQuantity,
t.create_time AS createTime,
t.status AS status,
@@ -204,7 +213,7 @@
t.id AS id,
t.table_num AS tableNum,
t.name_of_origin AS nameOfOrigin,
- sd.dict_name AS materialName,
+ t.material_name AS materialName,
t.incoming_quantity AS incomingQuantity,
t.create_time AS createTime,
t.status AS status,
--
Gitblit v1.9.3