From 266cb78c22a5644d5e2c15c42243b0b80ca7d233 Mon Sep 17 00:00:00 2001
From: 张磊磊 <201175954@qq.com>
Date: 星期二, 05 十二月 2023 17:13:16 +0800
Subject: [PATCH] 更改查询方式，添加
---
hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 163 insertions(+), 8 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
index 1c3c6d1..552f275 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
@@ -205,6 +205,9 @@
<if test="inspectDate != null">
inspect_date,
</if>
+ <if test="types != null">
+ types,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="mixingId != null">
@@ -245,6 +248,9 @@
</if>
<if test="inspectDate != null">
#{inspectDate,jdbcType=VARCHAR},
+ </if>
+ <if test="types != null">
+ #{types},
</if>
</trim>
</insert>
@@ -321,12 +327,10 @@
</if>
</trim>
</insert>
- <insert id="mixingConsumeInTwo" parameterType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume">
+ <insert id="mixingConsumeInTwo" >
insert into t_mixing_consume
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="mixingConsumeId != null">
mixing_consume_id,
- </if>
<if test="dictId != null">
dict_id,
</if>
@@ -357,11 +361,15 @@
<if test="star != null">
star,
</if>
+ <if test="constructionUnit != null">
+ construction_unit,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="mixingConsumeId != null">
- #{mixingConsumeId,jdbcType=VARCHAR},
- </if>
+<!-- <if test="mixingConsumeId != null">-->
+<!-- #{mixingConsumeId,jdbcType=VARCHAR},-->
+<!-- </if>-->
+ REPLACE(UUID(),'-',''),
<if test="dictId != null">
#{dictId,jdbcType=VARCHAR},
</if>
@@ -392,6 +400,9 @@
<if test="star != null">
#{star},
</if>
+ <if test="constructionUnit != null">
+ #{constructionUnit},
+ </if>
</trim>
</insert>
<select id="starInt" resultType="java.lang.Integer">
@@ -413,12 +424,16 @@
<if test="signboardName!=null and signboardName!='' ">
and tms.signboard_name like concat('%',#{signboardName},'%')
</if>
+ <if test="mixingSignboardId !=null and mixingSignboardId !='' ">
+ and tms.mixing_signboard_id=#{mixingSignboardId}
+ </if>
</select>
<select id="mixingConsumes" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume">
select
mc.mixing_consume_id as mixingConsumeId,
sd.dict_name as dictName,
+ mc.dict_id as dictId,
mc.spec as spec,
mc.manufacturer as manufacturer,
mc.wat_full as watFull,
@@ -427,10 +442,150 @@
mc.save_stamp as saveStamp,
mc.construction as construction,
mc.mixing_signboard_id as mixingSignboardId,
- mc.star as star
+ mc.star as star,
+ mc.create_time as createTime,
+ mc.construction_unit as constructionUnit
from t_mixing_consume mc
left join sys_dict sd on mc.dict_id=sd.dict_id
where mc.mixing_signboard_id=#{mixingSignboardId} and mc.star=#{star}
+<!-- <if test="strTime!=null and strTime!='' and endTime !=null and endTime!=''">-->
+<!-- and mc.create_time between #{strTime} and #{endTime}-->
+<!-- </if>-->
</select>
-
+ <select id="mixingConsumePull" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingSignboard">
+ select
+ tms.mixing_signboard_id as mixingSignboardId,
+ tms.signboard_name as signboardName,
+ sp.pro_name as proName,
+ sp.construction_unit as constructionUnit
+ from t_mixing_signboard tms left join sys_project sp
+ on tms.pro_id=sp.pro_id
+ </select>
+ <select id="siloPull" resultType="com.thhy.materials.modules.biz.concret.entity.TSilo">
+ select silo_id as siloId,
+silo_name as siloName,
+types
+ from t_silo
+ </select>
+ <update id="mixingUpdateType" parameterType="java.lang.String">
+ update t_mixing set types=2 where silo_id=#{siloId}
+ </update>
+ <select id="siloMixingList" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
+ SELECT
+ tm.mixing_id as mixingId,
+ tm.material as material,
+ tm.spec as spec,
+ tm.producer as producer,
+ tm.stove as stove,
+ tm.in_num as inNum,
+ tm.in_date as inDate,
+ tm.inspect_state as inspectState,
+ tm.report_number as reportNumber,
+ tm.stata as stata,
+ tm.silo_id as siloId,
+ tm.percentage as percentage,
+ tm.inspect_date as inspectDate,
+ ts.silo_name as siloName,
+ ts.types as types
+FROM
+ t_silo ts
+ LEFT JOIN t_mixing tm ON ts.silo_id=tm.silo_id
+ where tm.types=1
+ <if test="types!=null and types!='' ">
+ and ts.types=#{types}
+ </if>
+ <if test="stata!=null and stata!='' ">
+ and tm.stata=#{stata}
+ </if>
+ <if test="strTime!=null and strTime!=null and endTime!=null and endTime!='' ">
+ and tm.in_date between #{strTime} and #{endTime}
+ </if>
+ </select>
+ <update id="mixingUpdate" >
+ update t_mixing
+ <set>
+ <if test="material != null">
+ material = #{material,jdbcType=VARCHAR},
+ </if>
+ <if test="spec != null">
+ spec = #{spec,jdbcType=VARCHAR},
+ </if>
+ <if test="producer != null">
+ producer = #{producer,jdbcType=VARCHAR},
+ </if>
+ <if test="stove != null">
+ stove = #{stove,jdbcType=VARCHAR},
+ </if>
+ <if test="inNum != null">
+ in_num = #{inNum,jdbcType=VARCHAR},
+ </if>
+ <if test="inDate != null">
+ in_date = #{inDate,jdbcType=VARCHAR},
+ </if>
+ <if test="inspectState != null">
+ inspect_state = #{inspectState,jdbcType=INTEGER},
+ </if>
+ <if test="reportNumber != null">
+ report_number = #{reportNumber,jdbcType=VARCHAR},
+ </if>
+ <if test="stata != null">
+ stata = #{stata},
+ </if>
+ <if test="siloId != null">
+ silo_id = #{siloId},
+ </if>
+ <if test="percentage != null">
+ percentage = #{percentage},
+ </if>
+ <if test="inspectDate != null">
+ inspect_date = #{inspectDate},
+ </if>
+ </set>
+ where mixing_id = #{mixingId,jdbcType=VARCHAR}
+ </update>
+ <delete id="mixingDel" parameterType="java.lang.String">
+ delete from t_mixing where mixing_id=#{mixingId}
+ </delete>
+ <update id="mixingConsumeUpTwo" >
+ update t_mixing_consume
+ <set>
+ <if test="dictId != null">
+ dict_id = #{dictId,jdbcType=VARCHAR},
+ </if>
+ <if test="spec != null">
+ spec = #{spec,jdbcType=VARCHAR},
+ </if>
+ <if test="manufacturer != null">
+ manufacturer = #{manufacturer,jdbcType=VARCHAR},
+ </if>
+ <if test="watFull != null">
+ wat_full = #{watFull,jdbcType=VARCHAR},
+ </if>
+ <if test="planAmnt != null">
+ plan_amnt = #{planAmnt,jdbcType=VARCHAR},
+ </if>
+ <if test="factAmnt != null">
+ fact_amnt = #{factAmnt,jdbcType=VARCHAR},
+ </if>
+ <if test="saveStamp != null">
+ save_stamp = #{saveStamp,jdbcType=VARCHAR},
+ </if>
+ <if test="construction != null">
+ construction = #{construction,jdbcType=VARCHAR},
+ </if>
+ <if test="mixingSignboardId != null">
+ mixing_signboard_id = #{mixingSignboardId,jdbcType=VARCHAR},
+ </if>
+ <if test="star != null">
+ star = #{star},
+ </if>
+ </set>
+ where mixing_consume_id = #{mixingConsumeId,jdbcType=VARCHAR}
+ </update>
+ <delete id="mixingConsumeDel" >
+ delete from t_mixing_consume where mixing_consume_id=#{mixingConsumeId} and star=#{star}
+ </delete>
+ <delete id="mixingConsumeDelSign" >
+ delete from t_mixing_consume where mixing_signboard_id=#{mixingSignboardId} and star=#{star}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3