From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 15:55:19 +0800
Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 6631485..633ef7e 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -60,7 +60,7 @@
<association property="children" resultMap="SampleDefectsChildrenMap" javaType="java.util.List"/>
</resultMap>
- <resultMap id="ProductThingDto" type="com.yuanchu.mom.dto.SampleOrderDto">
+ <resultMap id="SampleOrderDto" type="com.yuanchu.mom.dto.SampleOrderDto">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
<result property="outEntrustCode" column="out_entrust_code" jdbcType="VARCHAR"/>
@@ -85,24 +85,26 @@
<result property="motorNumber" column="motor_number"/>
<result property="sampleName" column="sample_name"/>
<result property="sampleModel" column="sample_model"/>
+ <result property="name" column="name"/>
<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" resultType="com.yuanchu.mom.dto.SampleOrderDto">
- select *
+ <select id="selectInsOrderPage" resultMap="SampleOrderDto">
+ 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,
@@ -117,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
@@ -148,6 +147,9 @@
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>
@@ -190,6 +192,7 @@
A.model,
A.inspection_item,
A.company,
+ A.cost ,
A.`name`,
COUNT(1) num,
ROUND(SUM(A.price),2) price
@@ -199,6 +202,7 @@
isa.sample,
isa.model,
ins_sample_id,
+ times cost,
sum(c.price * times) price,
GROUP_CONCAT(distinct c.inspection_item SEPARATOR ',') inspection_item,
i.company,
--
Gitblit v1.9.3