From 68b2d4f7d3f122a7d6ab075c5455ac1d8ef6d932 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 六月 2024 17:58:55 +0800
Subject: [PATCH] 检验下单标签打印+标准库枚举筛选+报告生成修改+检验下单委托编号生成
---
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 182 ++++++++++++++++++++++++++++++---------------
1 files changed, 120 insertions(+), 62 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 32195f8..0138951 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -3,7 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsSampleMapper">
-
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsSample">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="insResult" column="ins_result" jdbcType="INTEGER"/>
@@ -48,7 +47,7 @@
LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
WHERE
io.state = 1
-# AND io.ins_state != 5
+ # AND io.ins_state != 5
and send_time is not null
and (isu.user_id = #{userId} OR isu.user_id is NULL)
GROUP BY
@@ -56,7 +55,9 @@
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 ins_sample_user GROUP BY ins_sample_id) md where td.id = md.id and user_id = #{userId}) isu2 on isu2.ins_sample_id = a.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 GROUP BY ins_sample_id) md where td.id = md.id and user_id = #{userId}) isu2 on
+ isu2.ins_sample_id = a.id
ORDER BY
a.user_id DESC,
a.type DESC,
@@ -90,7 +91,7 @@
LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
WHERE
io.state = 1
- # AND io.ins_state != 5
+ # AND io.ins_state != 5
and send_time is not null
and (isu.user_id = #{userId} OR isu.user_id is NULL)
GROUP BY
@@ -98,7 +99,9 @@
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 ins_sample_user GROUP BY ins_sample_id) md where td.id = md.id and user_id = #{userId}) isu2 on isu2.ins_sample_id = a.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 GROUP BY ins_sample_id) md where td.id = md.id and user_id = #{userId}) isu2 on
+ isu2.ins_sample_id = a.id
ORDER BY
a.user_id DESC,
a.type DESC,
@@ -111,20 +114,20 @@
<select id="selectSampleProductListByOrderId" resultMap="sampleDto">
select isa.*,
- 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.factory ip_factory,
+ ip.laboratory ip_laboratory,
ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -139,7 +142,7 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ins_sample_id,
ip.create_user ip_create_user,
@@ -152,29 +155,29 @@
ipr.equip_value,
ip.method_s
from ins_sample isa
- 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 ip on isa.id = ip.ins_sample_id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_order_id = #{id}
- and state = 1
- and ins_fiber_id is null
- and ins_fibers_id is null
+ and state = 1
+ and ins_fiber_id is null
+ and ins_fibers_id is null
</select>
<select id="getInsOrderAndSample" resultMap="sampleDto">
select isa.*,
- 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.factory ip_factory,
+ ip.laboratory ip_laboratory,
ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -189,7 +192,7 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ins_sample_id,
ip.create_user ip_create_user,
@@ -205,34 +208,35 @@
ip.tell,
ip.dic
from ins_sample isa
- 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 ip on isa.id = ip.ins_sample_id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_order_id = #{id}
- and state = 1
- and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
+ and state = 1
+ and ip.son_laboratory = #{laboratory}
+ and ins_fiber_id is null
+ and ins_fibers_id is null
</select>
<select id="getSampleEn" resultType="java.lang.String">
- select name_en from `center-lims`.product
+ select name_en
+ from `center-lims`.product
where name = #{sample}
</select>
<select id="selectSampleProductListByOrderId2" resultMap="sampleDto">
select isa.*,
- ip.id ip_id,
+ ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
inspection_item_class,
inspection_item_class_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -247,7 +251,7 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ins_sample_id,
ip.create_user ip_create_user,
@@ -265,19 +269,46 @@
where ins_order_id = #{id}
and state = 1
</select>
+
+ <select id="selectSampleProductListByOrderId3" resultMap="sampleDto3">
+ select isa.id,
+ sample_code,
+ entrust_code,
+ is_leave,
+ isa.model,
+ isa.ins_state,
+ ip.id ip_id,
+ inspection_item,
+ inspection_item_subclass,
+ io.sample_type io_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
+ ip.state,
+ ins_sample_id
+ from ins_sample isa
+ 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_order io on io.id = ins_order_id
+ where ip.state = 1
+ and ins_order_id in
+ <foreach collection="ids" open="(" close=")" item="id" separator=",">
+ #{id}
+ </foreach>
+ </select>
+
<select id="getInsProduct1" resultMap="product">
- select ip.id ip_id,
+ select ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_subclass,
inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -292,7 +323,7 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ins_sample_id,
ip.create_user ip_create_user,
@@ -308,7 +339,7 @@
ip.tell,
ip.dic
from ins_product ip
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
@@ -316,20 +347,20 @@
and ins_fibers_id is null
</select>
<select id="getInsProduct2" resultMap="product">
- select ip.id ip_id,
+ select 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.factory ip_factory,
+ ip.laboratory ip_laboratory,
ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -344,7 +375,7 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ins_sample_id,
ip.create_user ip_create_user,
@@ -360,26 +391,26 @@
ip.tell,
ip.dic
from ins_product ip
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_fibers_id = #{id}
and state = 1
and ins_fiber_id is null
</select>
<select id="getInsProduct3" resultMap="product">
- select ip.id ip_id,
+ select 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.factory ip_factory,
+ ip.laboratory ip_laboratory,
ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -394,7 +425,7 @@
bsm,
ask,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ins_sample_id,
ip.create_user ip_create_user,
@@ -410,7 +441,7 @@
ip.tell,
ip.dic
from ins_product ip
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
where ins_fiber_id = #{id}
and state = 1
and ins_fibers_id is null
@@ -483,6 +514,33 @@
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
+ <resultMap id="sampleDto3" type="com.yuanchu.mom.dto.SampleProductDto3">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
+ <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
+ <result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
+ <result property="joinName" column="join_name" jdbcType="VARCHAR"/>
+ <result property="ioSampleType" column="io_sample_type" jdbcType="VARCHAR"/>
+ <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="factory" column="factory" jdbcType="VARCHAR"/>
+ <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+ <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
+ <result property="sample" column="sample" jdbcType="VARCHAR"/>
+ <result property="model" column="model" jdbcType="VARCHAR"/>
+ <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="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="standardMethodListId" column="standard_method_list_id"/>
+ <result property="unit" column="unit"/>
+ <collection property="insProduct" resultMap="product"/>
+ </resultMap>
+
<resultMap id="insProductResult" type="com.yuanchu.mom.pojo.InsProductResult">
<result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
<result property="comValue" column="com_value" jdbcType="VARCHAR"/>
--
Gitblit v1.9.3