From 9f19d3a24f8474bf6f9eb9401888c44b34b381e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 十一月 2024 14:29:50 +0800
Subject: [PATCH] 第一次改动(检验任务与样品关联,附件与样品关联,报告与样品关联)
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 268 +++++++++++++++++++++++------------------------------
1 files changed, 118 insertions(+), 150 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 3a94afe..a69516e 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -25,10 +25,25 @@
</resultMap>
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
- select * from(select * from(
+ select * from(
+ select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell,verify_user,ios.id orderStateId,ios.create_time,ios.sort,sort_time,version,ios.num num1
+ a.*,
+ ios.ins_state,
+ ios.verify_tell,
+ verify_user,
+ ios.id orderStateId,
+ ios.create_time,
+ (SELECT ins_time FROM ins_order_state WHERE ins_order_id = a.id AND laboratory = a.son_laboratory and
+ ins_order_state.ins_sample_id=a.sampleId ORDER BY ins_time DESC LIMIT 1) AS ins_time ,
+ iou.submit_time ,
+ ios.sort,
+ sort_time,
+ version,
+ ios.num-1 num1
FROM
+ ins_order_state ios
+ LEFT JOIN
(
SELECT
io.id,
@@ -36,11 +51,12 @@
io.type,
io.appointed,
io.send_time,
- group_concat(distinct isa.sample,' ') sample,
+ isa.id sampleId,
+ isa.sample sample,
+ isa.sample_code sampleCode,
userName,
checkName,
ip.son_laboratory,
- io.ins_time,
io.laboratory
FROM
ins_order io
@@ -52,7 +68,7 @@
and u.state=0
GROUP BY ins_sample_id
ORDER BY ins_sample_id
- ) isu ON isu.ins_sample_id = io.id
+ ) isu ON isu.ins_sample_id = isa.id
LEFT JOIN (
SELECT ins_sample_id,uu.name checkName
FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
@@ -60,7 +76,7 @@
and u.state=1
GROUP BY ins_sample_id
ORDER BY ins_sample_id
- )isu2 ON isu2.ins_sample_id = io.id
+ )isu2 ON isu2.ins_sample_id = isa.id
LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
WHERE io.state = 1 and send_time is not null
<if test="userName !=null and userName!=''">
@@ -72,7 +88,8 @@
ip.son_laboratory,
io.id
) a
- LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
+ ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory and ios.ins_sample_id=a.sampleId
+ LEFT JOIN ins_order_user iou ON ios.id = iou.ins_order_state_id and ios.num=iou.num
ORDER BY
ios.sort,
sort_time desc,
@@ -93,8 +110,10 @@
<select id="inspectionOrderDetailsTaskSwitching" resultType="com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo">
select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,<!--(ios.verify_user = #{userId})--> verify_user
+ a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,verify_user
FROM
+ ins_order_state ios
+ LEFT JOIN
(
SELECT
io.id,
@@ -102,7 +121,9 @@
io.type,
io.appointed,
io.send_time,
- group_concat(distinct isa.sample,' ') sampleType,
+ isa.id sampleId,
+ isa.sample sampleType,
+ isa.sample_code sampleCode,
isu.user_id,
user.name userName,
ip.son_laboratory,
@@ -111,7 +132,7 @@
FROM
ins_order io
LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
- LEFT JOIN ( <!--SELECT * FROM ins_sample_user GROUP BY ins_sample_id, user_id -->
+ LEFT JOIN (
SELECT *
FROM ins_sample_user u
WHERE son_laboratory=#{sonLaboratory} and (ins_sample_id, id) IN (
@@ -121,12 +142,11 @@
GROUP BY ins_sample_id
)
ORDER BY ins_sample_id, id
- ) isu ON isu.ins_sample_id = io.id
+ ) isu ON isu.ins_sample_id = isa.id
LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
LEFT JOIN user ON isu.user_id = user.id
WHERE
io.state = 1
- -- # AND io.ins_state != 5
and send_time is not null
<if test="userId !=null and userId!=''">
and (isu.user_id = #{userId} OR isu.user_id is NULL )
@@ -136,21 +156,21 @@
ip.son_laboratory,
io.id
) a
- LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
- left join (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM
+ ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory and a.sampleId=ios.ins_sample_id
+ left join
+ (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM
ins_sample_user where son_laboratory=#{sonLaboratory} GROUP BY ins_sample_id) md where td.id = md.id
<if test="userId !=null and userId!=''">
and user_id = #{userId} OR user_id is NULL
</if>
OR user_id is NULL
) isu2 on
- isu2.ins_sample_id = a.id
+ isu2.ins_sample_id = a.sampleId
where ins_state is not null
<if test="laboratory != null and laboratory != ''">
and a.laboratory=#{laboratory}
</if>
ORDER BY
- <!--a.user_id DESC,-->
a.type DESC,
a.id
) b
@@ -161,21 +181,20 @@
<select id="selectSampleProductListByOrderId" resultMap="sampleDto">
select isa.*,
- ios.num num1,
- ip.id ip_id,
+ ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_class,
inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
+ ip.sample_type ip_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -191,112 +210,19 @@
ask,
tell,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ins_sample_id,
- ip.create_user ip_create_user,
- ip.update_user ip_update_user,
- ip.create_time ip_create_time,
- ip.update_time ip_update_time,
+ ip.create_user ip_create_user,
+ ip.update_user ip_update_user,
+ ip.create_time ip_create_time,
+ ip.update_time ip_update_time,
template_id,
- ipr.ins_value,
- ipr.com_value,
- ipr.equip_value,
- ipr2.frequency,
- ipr2.often,
- ipr2.port,
- ipr2.angle,
- ipr2.value,
- ipr2.result,
- ipr2.equip_value equipValue2,
- ipr2.equip_name equipName2,
ip.method_s
from ins_sample isa
- left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
left join ins_product ip on isa.id = ip.ins_sample_id
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
- left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
- where isa.ins_order_id = #{id}
+ where isa.id = #{id}
and state = 1
- and ios.laboratory = #{laboratory}
- and (ipr2.num = ios.num or ipr2.num is null)
- and (ipr.num = ios.num or ipr.num is null)
- and isa.id in (select id1
- from (select is2.id id1, ip.id
- from ins_sample is2
- left join ins_product ip on is2.id =
- ip.ins_sample_id
- where ip.id is not null) s)
- order by case
- when man_hour_group is NULL then 1
- when man_hour_group = '' then 1
- else 0 end,
- CASE
- WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
- WHEN man_hour_group REGEXP '[0-9]+'
- THEN CAST(SUBSTRING(man_hour_group, 2) AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
- , id asc
- </select>
- <select id="selectSampleProductListByOrder2Id" resultMap="sampleDto">
- select isa.*,
- ios.num num1,
- ip.id ip_id,
- inspection_item,
- inspection_item_en,
- inspection_item_class,
- inspection_item_class_en,
- inspection_item_subclass,
- inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
- son_laboratory,
- ip.unit ip_unit,
- price,
- man_hour,
- man_hour_group,
- inspection_item_type,
- inspection_value_type,
- device_group,
- checkout_number,
- section,
- value_type,
- method,
- man_day,
- bsm,
- ask,
- tell,
- `last_value`,
- ip.ins_result ip_ins_result,
- state,
- ins_sample_id,
- ip.create_user ip_create_user,
- ip.update_user ip_update_user,
- ip.create_time ip_create_time,
- ip.update_time ip_update_time,
- template_id,
- ipr.ins_value,
- ipr.com_value,
- ipr.equip_value,
- ipr2.frequency,
- ipr2.often,
- ipr2.port,
- ipr2.angle,
- ipr2.value,
- ipr2.result,
- ipr2.equip_value equipValue2,
- ipr2.equip_name equipName2,
- ip.method_s
- from ins_sample isa
- left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
- left join ins_product ip on isa.id = ip.ins_sample_id
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
- left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
- where isa.ins_order_id = #{id}
- and state = 1
- and ios.laboratory = #{laboratory}
and isa.id in (select id1
from (select is2.id id1, ip.id
from ins_sample is2
@@ -346,7 +272,7 @@
`last_value`,
ip.ins_result ip_ins_result,
state,
- ins_sample_id,
+ ios.ins_sample_id,
ip.create_user ip_create_user,
ip.update_user ip_update_user,
ip.create_time ip_create_time,
@@ -356,6 +282,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -370,11 +298,11 @@
ip.temperature,
ip.humidity
from ins_sample isa
- left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
+ left join ins_order_state ios on isa.id = ios.ins_sample_id
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
- where isa.ins_order_id = #{id}
+ where isa.id = #{sampleId}
and state = 1
and ip.son_laboratory = #{laboratory}
and ios.laboratory = #{laboratory}
@@ -414,7 +342,7 @@
`last_value`,
ip.ins_result ip_ins_result,
state,
- ins_sample_id,
+ ios.ins_sample_id,
ip.create_user ip_create_user,
ip.update_user ip_update_user,
ip.create_time ip_create_time,
@@ -424,6 +352,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -438,14 +368,15 @@
ip.temperature,
ip.humidity
from ins_sample isa
- left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
+ left join ins_order_state ios on isa.id = ios.ins_sample_id
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
- where isa.ins_order_id = #{id}
+ where isa.id = #{sampleId}
and state = 1
and ip.son_laboratory = #{laboratory}
and ios.laboratory = #{laboratory}
+ and (ipr2.num is null or ipr.num is null)
</select>
<select id="getSampleEn" resultType="java.lang.String">
select name_en
@@ -496,6 +427,8 @@
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -568,6 +501,8 @@
ipr.ins_value,
ipr.com_value,
ipr.equip_value,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -598,6 +533,7 @@
<select id="selectSampleProductListByOrderId3" resultMap="sampleDto3">
select isa.id,
sample_code,
+ motor_number,
isa.sample,
entrust_code,
is_leave,
@@ -610,10 +546,13 @@
ip.sample ip_sample,
ip.model ip_model,
ip.state,
+ io.issue_time,
+ u.name issueName,
ins_sample_id
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_order io on io.id = ins_order_id
+ left join user u on io.issue_user = u.id
where ip.state = 1
and ins_order_id in
<foreach collection="ids" open="(" close=")" item="id" separator=",">
@@ -658,7 +597,7 @@
`last_value`,
ip.ins_result ip_ins_result,
state,
- ins_sample_id,
+ ios.ins_sample_id,
ip.create_user ip_create_user,
ip.update_user ip_update_user,
ip.create_time ip_create_time,
@@ -668,6 +607,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -681,19 +622,17 @@
ip.dic
from ins_product ip
left join ins_sample isa on ip.ins_sample_id = isa.id
- left join ins_order_state ios on ios.ins_order_id = isa.ins_order_id
+ left join ins_order_state ios on ios.ins_sample_id = isa.id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
- where ins_sample_id = #{id}
+ where ios.ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
and ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
and (ipr2.num = ios.num or ipr2.num is null)
and (ipr.num = ios.num or ipr.num is null)
- order by ipr.id, ipr2.id
+ order by ip.id, ipr.id, ipr2.id
</select>
<select id="getIns2Product1" resultMap="product">
select ip.id ip_id,
@@ -726,7 +665,7 @@
`last_value`,
ip.ins_result ip_ins_result,
state,
- ins_sample_id,
+ ios.ins_sample_id,
ip.create_user ip_create_user,
ip.update_user ip_update_user,
ip.create_time ip_create_time,
@@ -736,6 +675,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -749,17 +690,15 @@
ip.dic
from ins_product ip
left join ins_sample isa on ip.ins_sample_id = isa.id
- left join ins_order_state ios on ios.ins_order_id = isa.ins_order_id
+ left join ins_order_state ios on ios.ins_sample_id = isa.id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
- where ins_sample_id = #{id}
+ where ios.ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
and ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
- order by ipr.id, ipr2.id
+ order by ip.id, ipr.id, ipr2.id
</select>
<select id="get2InsProduct1" resultMap="product">
select ip.id ip_id,
@@ -792,7 +731,7 @@
`last_value`,
ip.ins_result ip_ins_result,
state,
- ins_sample_id,
+ ios.ins_sample_id,
ip.create_user ip_create_user,
ip.update_user ip_update_user,
ip.create_time ip_create_time,
@@ -802,6 +741,8 @@
ipr.com_value,
ipr.equip_value,
ipr.equip_name,
+ ipr.before_check,
+ ipr.after_check,
ipr2.frequency,
ipr2.often,
ipr2.port,
@@ -815,19 +756,16 @@
ip.dic
from ins_product ip
left join ins_sample isa on ip.ins_sample_id = isa.id
- left join ins_order_state ios on ios.ins_order_id = isa.ins_order_id
+ left join ins_order_state ios on ios.ins_sample_id = isa.id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
- where ins_sample_id = #{id}
+ where ios.ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
and ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
- and ipr2.num = #{num}
- and ipr.num = #{num}
- order by ipr.id, ipr2.id
+ and (ipr2.num = #{num} or ipr.num = #{num})
+ order by ip.id, ipr.id, ipr2.id
</select>
<select id="getReportModel" resultType="java.util.Map">
@@ -840,6 +778,7 @@
<result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
<result property="joinName" column="join_name" jdbcType="VARCHAR"/>
<result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="motorNumber" column="motor_number" jdbcType="VARCHAR"/>
<result property="testRequirements" column="test_requirements" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
@@ -891,7 +830,6 @@
<result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
<result property="insResult" column="ip_ins_result" jdbcType="INTEGER"/>
<result property="state" column="state" jdbcType="INTEGER"/>
- <result property="insBushId" column="ins_bush_id" jdbcType="INTEGER"/>
<result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
<result property="createUser" column="ip_create_user" jdbcType="INTEGER"/>
<result property="updateUser" column="ip_update_user" jdbcType="INTEGER"/>
@@ -917,6 +855,7 @@
<result property="code" column="entrust_code" jdbcType="VARCHAR"/>
<result property="isLeave" column="is_leave" jdbcType="VARCHAR"/>
<result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="motorNumber" column="motor_number" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
@@ -925,6 +864,8 @@
<result property="insState" column="ins_state" jdbcType="INTEGER"/>
<result property="joinNum" column="join_num" jdbcType="INTEGER"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="issueTime" column="issue_time"/>
+ <result property="issueName" column="issueName"/>
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -938,6 +879,8 @@
<result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
<result property="comValue" column="com_value" jdbcType="VARCHAR"/>
<result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
+ <result property="beforeCheck" column="before_check" jdbcType="VARCHAR"/>
+ <result property="afterCheck" column="after_check" jdbcType="VARCHAR"/>
<result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
</resultMap>
<resultMap id="insProductResult2" type="com.yuanchu.mom.pojo.InsProductResult2">
@@ -995,4 +938,29 @@
where ins_order_id = #{orderId}
and ip.id is not null
</select>
+ <select id="selectSampleListByOrderId" resultType="com.yuanchu.mom.pojo.InsSample">
+ select DISTINCT ins_sample.*
+ from ins_sample
+ left join ins_product ip on ins_sample.id = ip.ins_sample_id
+ where ins_order_id = #{orderId}
+ and ip.id is not null
+ </select>
+ <select id="selectInsSample" resultType="com.yuanchu.mom.pojo.InsSample">
+ select isa.*,
+ case when entrust_code is null then out_entrust_code else entrust_code end as entrust_code
+ from ins_sample isa
+ left join ins_order io on isa.ins_order_id = io.id
+ where ins_order_id in
+ <foreach collection="ids" open="(" close=")" item="id" separator=",">
+ #{id}
+ </foreach>
+ </select>
+ <select id="selectSample" resultType="com.yuanchu.mom.pojo.InsSample">
+ select distinct isa.*
+ from ins_sample isa
+ left join ins_product ip on isa.id = ip.ins_sample_id
+ where son_laboratory = '鐢佃矾璇曢獙'
+ and state = 1
+ and ins_order_id = #{insOrderId}
+ </select>
</mapper>
--
Gitblit v1.9.3