From 01af9cb1c94e459184ad4d9836662094f14bac7e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 16 四月 2024 00:15:27 +0800
Subject: [PATCH] 增加标准对于产品标准的区分，修复若干其她bug
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 75 insertions(+), 26 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 9c99c2c..cc2e865 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -20,24 +20,6 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,entrust_code,sample_code,
- custom,company,code,
- type,appointed_time,laboratory,
- smaple_type,model,sample,
- sample_num,is_leave,leave_num,
- ins_progress,state,remark,
- otc_code,create_user,create_time,
- update_user,update_time
- </sql>
-
- <select id="addInsOrder">
- insert into ins_order
- (entrust_code,sample_code,custom,company,code,type,laboratory,model,sample,sample_num,is_leave,leave_num,ins_progress,state,remark,otc_code,create_user,create_time,update_user,update_time)
- values
- (#{entrustCode},#{sampleCode},#{custom},#{company},#{code},#{type},#{appointedTime},#{laboratory},#{smapleType},#{model},#{sample},#{sampleNum},#{isLeave},#{leaveNum},#{insProgress},#{state},#{remark},#{otcCode},#{createUser},#{createTime},#{updateUser},#{updateTime})
- </select>
-
<resultMap id="OrderThingDto" type="com.yuanchu.mom.dto.OrderThingDto">
<result property="id" column="id"/>
<result property="company" column="company"/>
@@ -68,13 +50,6 @@
<result property="remark" column="remark"/>
</resultMap>
- <select id="getOrderThing" resultMap="OrderThingDto">
- select *
- from ins_order io
- left join ins_product ip on ip.ins_order_id = io.id
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
- </select>
-
<select id="selectInsOrderParameter" resultType="com.yuanchu.mom.pojo.InsOrder">
select *
from (
@@ -100,6 +75,80 @@
${ew.customSqlSegment}
</if>
</select>
+ <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
+ select *
+ from (
+ SELECT
+ io.*,
+ ir.id report_id,
+ concat(ROUND((select count(*) from ins_sample isa2
+ where ins_state = 5 and isa2.ins_order_id = io.id) / (select count(*) from ins_sample isa2
+ where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress
+ FROM
+ ins_order io
+ LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id
+ LEFT JOIN ( SELECT id, ins_order_id, is_ratify FROM ins_report WHERE is_ratify = 1 ) ir ON io.id =
+ ir.ins_order_id
+ GROUP BY
+ io.id
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+ <select id="getLaboratoryCode" resultType="java.lang.String">
+ select laboratory_number
+ from laboratory
+ where laboratory_name = #{name}
+ </select>
+ <select id="selectSampleAndProductByOrderId" resultType="com.yuanchu.mom.dto.SampleProductDto2">
+ select *
+ from (
+ select i.id,isa.sample_code,isa.sample,isa.model,ip.state,ip.unit,ip.inspection_item,ip.inspection_item_subclass,
+ ip.son_laboratory,ip.inspection_item_type,ip.inspection_value_type,ip.ask,ip.`last_value`,ip.ins_result,ipr.equip_value
+ from ins_sample isa
+ left join ins_order i on isa.ins_order_id = i.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 ip.state = 1
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+ <select id="selectCostStatistics" resultType="com.yuanchu.mom.dto.CostStatisticsDto">
+ select * from (
+ SELECT
+ i.id,
+ i.entrust_code,
+ i.create_time,
+ isa.sample,
+ isa.model,
+ c.price,
+ c.inspection_item,
+ u.company,
+ u.`name`,
+ i.create_user,
+ c.ins_sample_id
+ FROM
+ ins_order i
+ LEFT JOIN ins_sample isa ON isa.ins_order_id = i.id
+ LEFT JOIN `user` u ON u.id = i.user_id
+ LEFT JOIN (select SUM(b.price) price,b.ins_sample_id,GROUP_CONCAT(b.inspection_item SEPARATOR ',')
+ inspection_item from (select * from ins_product where state = 1 GROUP BY ins_sample_id,man_hour_group) b GROUP
+ BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+ <select id="selectDeviceList" resultType="java.util.Map">
+ select device_name,specification_model,factory_no,date_format(latest_traceability, '%Y-%m-%d') latest_traceability from device
+ where device_name in
+ <foreach collection="names" index="index" open="(" separator="," close=")" item="val">
+ #{val}
+ </foreach>
+ </select>
<update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
UPDATE ins_order
@@ -121,7 +170,7 @@
</set>
<where>
id=#{id}
- </where>-->
+ </where>
</update>
</mapper>
--
Gitblit v1.9.3