From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 27 一月 2021 16:54:34 +0800
Subject: [PATCH] 合并
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index 3fe1302..b55d128 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -64,6 +64,9 @@
<result property="status" column="status" typeHandler="com.nanometer.smartlab.entity.handler.ApplyStatusHandler"></result>
<result property="applyUserId" column="apply_user_id"></result>
<result property="arrivalTime" column="arrival_time"></result>
+ <result property="articleNumber" column="articleNumber"></result>
+ <result property="projectManage" column="projectManage"/>
+ <result property="project" column="project"/>
<association property="reagent" javaType="com.nanometer.smartlab.entity.SysReagent">
<id property="id" column="reagent_id"></id>
<result property="name" column="reagentName"></result>
@@ -296,9 +299,7 @@
sr.dangerous_flag,
oa.num,
oa.used,
- oa.arrival_num,
- su.`name` apply_user_id,
- oa.arrival_time
+ su.`name` apply_user_id
</sql>
<sql id="getOpeApplyReserveList_queryJoins1">
@@ -326,6 +327,12 @@
<if test="status != null and status != ''">
and oa.status =#{status}
</if>
+ <if test="productSn != null and productSn != ''">
+ and sr.product_sn like concat('%',#{productSn},'%')
+ </if>
+ <if test="applyCode != null and applyCode != ''">
+ and oa.apply_code = #{applyCode}
+ </if>
</sql>
<select id="getOpeApplyReserveTotalCount" parameterType="java.util.Map"
@@ -340,10 +347,21 @@
<select id="getOpeApplyReserveTotalCountFor" parameterType="java.util.Map"
resultType="int">
select count(1)
+ from
+ (select count(1)
from ope_apply as oa
- <include refid="getOpeApplyReserveList_queryJoins1" />
+ LEFT JOIN sys_reagent sr ON sr.id = oa.reagent_id
+ LEFT JOIN sys_user su ON su.id = oa.apply_user_id
+ LEFT JOIN base_meta AS bm2 ON sr.control_products = bm2.id
+ LEFT JOIN base_meta AS bm3 ON sr.reagent_format = bm3.id
+ LEFT JOIN base_meta AS bm4 ON sr.reagent_character = bm4.id
+ LEFT JOIN base_meta AS bm1 ON sr.product_home = bm1.id
+ LEFT JOIN sys_project as project on project.project = su.project
+ LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id
where oa.valid_flag = 1 and (oa.status=4 or oa.status=6)
<include refid="getOpeApplyReserveList_queryWhereSql" />
+ GROUP BY oa.id
+ )as oaa
</select>
<select id="getOpeApplyReserveList" parameterType="java.util.Map"
@@ -354,7 +372,7 @@
<include refid="getOpeApplyReserveList_queryJoins2" />
where oa.valid_flag = 1
<include refid="getOpeApplyReserveList_queryWhereSql" />
-
+ GROUP BY oa.id
order by oa.update_time desc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
@@ -363,13 +381,41 @@
<select id="getOpeApplyReserveListFor" parameterType="java.util.Map"
resultMap="OpeApplyReserve">
- <include refid="getOpeApplyReserveList_queryColumns" />
- from ope_apply as oa
- <include refid="getOpeApplyReserveList_queryJoins1" />
- <include refid="getOpeApplyReserveList_queryJoins2" />
+ SELECT
+ oa.id,
+ oa.apply_code,
+ sr.id reagent_id,
+ oa. STATUS,
+ sr.product_sn reagentProductSn,
+ sr.`name` reagentName,
+ bm2.meta_value controlProducts,
+ bm3.meta_value reagentFormat,
+ sr.main_metering reagentMainMetering,
+ sr.price reagentPrice,
+ sr.cas reagentCas,
+ oa.article_number articleNumber,
+ bm4.meta_value reagentCharacter,
+ bm1.meta_value productHome,
+ sr.dangerous_flag,
+ oa.num,
+ oa.used,
+ su.`name` apply_user_id,
+ su.project,
+ su1.`name` as projectManage,
+ oa.arrival_time
+ FROM
+ ope_apply AS oa
+ LEFT JOIN sys_reagent sr ON sr.id = oa.reagent_id
+ LEFT JOIN sys_user su ON su.id = oa.apply_user_id
+ LEFT JOIN base_meta AS bm2 ON sr.control_products = bm2.id
+ LEFT JOIN base_meta AS bm3 ON sr.reagent_format = bm3.id
+ LEFT JOIN base_meta AS bm4 ON sr.reagent_character = bm4.id
+ LEFT JOIN base_meta AS bm1 ON sr.product_home = bm1.id
+ LEFT JOIN sys_project as project on project.project = su.project
+ LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id
where oa.valid_flag = 1 and (oa.status=4 or oa.status=6)
<include refid="getOpeApplyReserveList_queryWhereSql" />
-
+ GROUP BY oa.id
order by oa.update_time desc
<if test="first != null and pageSize != null">
limit #{first}, #{pageSize}
@@ -421,12 +467,17 @@
<update id="updateByReId" parameterType="java.util.Map">
update ope_apply set reagent_id=#{newReId} where reagent_id=#{oldReId}
</update>
+
<update id="updateOpeApplyInfo" parameterType="java.util.Map">
update
ope_apply
- set status = #{status},
- arrival_time = #{arrivalTime},
- consignee_id = #{consigneeId}
+ set status = #{status}
+ <if test="arrivalTime!=null" >
+ ,arrival_time = #{arrivalTime}
+ </if>
+ <if test="consigneeId!=null" >
+ ,consignee_id = #{consigneeId}
+ </if>
where valid_flag = 1
and id = #{applyId}
</update>
--
Gitblit v1.9.2