From 0e96251ba40dec171d92f99a2ec482f692bdf1ab Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:30:52 +0800
Subject: [PATCH] 完成截止12.26测试出来的问题
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 34a07c7..4d51c44 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -89,21 +89,22 @@
<collection property="reportDtos" ofType="com.yuanchu.mom.dto.ReportDto" resultMap="reportDto"/>
</resultMap>
<resultMap id="reportDto" type="com.yuanchu.mom.dto.ReportDto">
- <result property="reportId" column="reportId"/>
+ <result property="reportId" column="report_id"/>
<result property="url" column="url"/>
<result property="urlS" column="urlS"/>
- <result property="name" column="name"/>
+ <result property="codeUrl" column="codeUrl"/>
</resultMap>
<select id="selectInsOrderPage" resultMap="SampleOrderDto">
- select *
+ select *from (select a.* ,
+ ir.id report_id,
+ ir.url,
+ ir.url_s,
+ ir.sample_code as codeUrl
from (
SELECT
io.*,
isau.user_id assign,
- 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,
@@ -118,9 +119,6 @@
ins_sample isa ON io.id = isa.ins_order_id
LEFT JOIN
ins_sample_user isau ON isau.ins_sample_id = io.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
@@ -149,6 +147,10 @@
GROUP BY io.id,type
order by type desc,io.id desc
) a
+ LEFT JOIN
+ (SELECT r.id, r.ins_order_id, is_ratify, url, url_s,sample_code FROM ins_report r left join ins_sample isa on
+ r.ins_sample_id = isa.id WHERE is_ratify = 1) ir ON a.id =
+ ir.ins_order_id )b
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -191,8 +193,9 @@
A.model,
A.inspection_item,
A.company,
+ A.cost ,
A.`name`,
- COUNT(1) num,
+ COUNT(1) num,
ROUND(SUM(A.price),2) price
FROM (SELECT i.id,
i.entrust_code,
@@ -200,7 +203,8 @@
isa.sample,
isa.model,
ins_sample_id,
- sum(c.price * times) price,
+ times cost,
+ sum(c.price * times) price,
GROUP_CONCAT(distinct c.inspection_item SEPARATOR ',') inspection_item,
i.company,
u.`name`
@@ -247,11 +251,19 @@
</if>
</select>
<select id="selectDeviceList" resultType="java.util.Map">
- select device_name,specification_model,management_number,<!--DATE_ADD(date_format(last_calibration_date,
- '%Y-%m-%d'),INTERVAL calibration_date month)--> date_format(next_calibration_date,'%Y-%m-%d')
+ select device_name,
+ specification_model,
+ management_number,
+ date_format(CASE
+ WHEN dmr.next_calibration_date is not null THEN dmr.next_calibration_date
+ WHEN d.next_calibration_date > CURDATE() THEN d.next_calibration_date
+ END,'%Y-%m-%d')
+ <!--date_format(next_calibration_date,'%Y-%m-%d')-->
latest_traceability
- from device
- where device.management_number in
+ from device d
+ left join
+ device_metric_record dmr on d.id = dmr.device_id
+ where d.management_number in
<foreach collection="names" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
@@ -384,7 +396,7 @@
A.inspection_item,
A.company,
A.`name`,
- COUNT(1) num,
+ COUNT(1) num,
ROUND(SUM(A.price),2) price
FROM (SELECT i.id,
i.entrust_code,
@@ -392,7 +404,7 @@
isa.sample,
isa.model,
ins_sample_id,
- sum(c.price * times) price,
+ sum(c.price * times) price,
GROUP_CONCAT(distinct c.inspection_item SEPARATOR ',') inspection_item,
i.company,
u.`name`
--
Gitblit v1.9.3