From 5357fcd46f03e4b0c4ec9402d9c4fe561ffd2ce6 Mon Sep 17 00:00:00 2001 From: 张磊磊 <201175954@qq.com> Date: 星期五, 08 十二月 2023 13:04:59 +0800 Subject: [PATCH] 判断条件 --- hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml index 5ceb27c..179b10e 100644 --- a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml +++ b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml @@ -147,10 +147,16 @@ where material_release_id=#{materialReleaseId} </update> <select id="pieceList" resultType="com.thhy.materials.modules.biz.concret.entity.dto.PieceDto"> - select by_id as byId from t_piece + select by_id as byId, + BldTim as bldTim, + types as types + from t_piece where 1=1 <if test="byId!=null and byId!='' "> and by_id=#{byId} + </if> + <if test="types!=null and types!=''"> + and types=#{types} </if> ORDER BY by_id desc </select> @@ -161,7 +167,7 @@ PlanAmnt as planamnt, FactAmnt as factamnt from t_raw_material - where Piece=#{byId} + where Piece=#{byId} and types=#{types} </select> <insert id="mixingInsert" > insert into t_mixing @@ -433,7 +439,7 @@ <select id="mixingConsumes" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume"> select mc.mixing_consume_id as mixingConsumeId, - sd.dict_name as dictName, + -- sd.dict_name as dictName, mc.dict_id as dictId, mc.spec as spec, mc.manufacturer as manufacturer, @@ -447,7 +453,7 @@ 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 + -- 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}--> -- Gitblit v1.9.3