From 12de000e79c094471e0a5b55cb49b966d5b93721 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 02 八月 2024 13:13:09 +0800
Subject: [PATCH] 检验下单优化查询语句

---
 inspect-server/src/main/resources/mapper/InsOrderMapper.xml |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 9aa7a27..6c549ad 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrder">
         <id property="id" column="id" jdbcType="INTEGER"/>
         <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
+        <result property="outEntrustCode" column="out_entrust_code" jdbcType="VARCHAR"/>
         <result property="custom" column="custom" jdbcType="VARCHAR"/>
         <result property="company" column="company" jdbcType="VARCHAR"/>
         <result property="code" column="code" jdbcType="VARCHAR"/>
@@ -59,13 +60,13 @@
     <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
         select *
         from (
-        SELECT
+        <!--SELECT
         io.*,
         ir.id report_id,
         ir.url,
         ir.url_s,
         (select count(*) from ins_sample isa2
-        where isa2.ins_order_id = io.id and isa2.sample_code NOT REGEXP '/') sample_num,
+        where isa2.ins_order_id = io.id and  CHAR_LENGTH(isa2.sample_code) &lt;32 ) sample_num,
         concat(ROUND((select count(*) from ins_product ip
         where state = 1 and ins_result is not null and ip.ins_sample_id in (select id from ins_sample where
         ins_sample.ins_order_id= io.id )) / (select count(*) from ins_product ip2
@@ -86,6 +87,50 @@
             and io.laboratory=#{laboratory}
         </if>
         GROUP BY
+        io.id-->
+
+        SELECT
+        io.*,
+        ir.id report_id,
+        ir.url,
+        ir.url_s,
+        sample_counts.sample_num,
+        CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS insProgress,
+        GROUP_CONCAT(DISTINCT isa.sample_code SEPARATOR ' ') AS sample_code,
+        GROUP_CONCAT(DISTINCT isa.sample SEPARATOR ' ') AS sample_name,
+        GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
+        u.name
+        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, url, url_s FROM ins_report WHERE is_ratify = 1) ir ON io.id = ir.ins_order_id
+        LEFT JOIN
+        user u ON io.create_user = u.id
+        LEFT JOIN
+        (SELECT ins_order_id, COUNT(*) AS sample_num
+        FROM ins_sample
+        WHERE 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 )
+        GROUP BY ins_order_id) sample_counts ON io.id = sample_counts.ins_order_id
+        LEFT JOIN
+        (SELECT ins_sample.ins_order_id, COUNT(*) AS total_count
+        FROM ins_product
+        JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
+        WHERE ins_product.state = 1
+        GROUP BY ins_sample.ins_order_id) total_product_counts ON io.id = total_product_counts.ins_order_id
+        LEFT JOIN
+        (SELECT ins_sample.ins_order_id, COUNT(*) AS approved_count
+        FROM ins_product
+        JOIN ins_sample ON ins_product.ins_sample_id = ins_sample.id
+        WHERE ins_product.state = 1 AND ins_product.ins_result IS NOT NULL
+        GROUP BY ins_sample.ins_order_id) approved_product_counts ON io.id = approved_product_counts.ins_order_id
+        WHERE
+        1=1
+        <if test="laboratory!=null and laboratory!=''">
+            AND io.laboratory=#{laboratory}
+        </if>
+        GROUP BY
         io.id
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">

--
Gitblit v1.9.3