From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB，请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑，报告中仅显示温度信息 - 新增印章管理功能，支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程，增加多种报告类型常量定义 - 优化附件上传功能，增加空值检查和返回值处理 - 调整委托编号生成逻辑，完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 6380858..3f6eabd 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -115,12 +115,14 @@
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
u.name,
testing_name,
- ip.son_laboratory
+ ip.son_laboratory,
+ isr.reject_remark AS sample_reject_remark
FROM
ins_order io
LEFT JOIN
ins_sample isa ON io.id = isa.ins_order_id
left join ins_product ip on ip.ins_sample_id = isa.id
+ LEFT JOIN ins_sample_receipt isr ON isr.ins_order_id = io.id
LEFT JOIN
ins_sample_user isau ON isau.ins_sample_id = io.id
LEFT JOIN
@@ -152,7 +154,10 @@
ORDER BY ins_sample_id) isu ON isu.ins_sample_id = io.id
where (io.ifs_inventory_id IS NULL OR TRIM(io.ifs_inventory_id) = '')
<if test="isOrderAll != null and isOrderAll != ''">
- AND io.state in (1, 4)
+ AND io.state in (1, 4, 5)
+ </if>
+ <if test="receiptSubmitted != null and receiptSubmitted != ''">
+ AND isr.status = 1
</if>
<if test="laboratory!=null and laboratory!=''">
AND io.laboratory=#{laboratory}
@@ -181,6 +186,8 @@
type,
entrust_code,
company,
+ sample,
+ sample_view,
remark,
create_time,
state
@@ -234,18 +241,23 @@
</if>
</select>
- <select id="selectDeviceList" resultType="java.util.Map">
+ <select id="selectDeviceListByIds" resultType="java.util.Map">
select device_name,
en_device_name,
specification_model,
management_number,
+ factory_no,
date_format(activation_date,'%Y-%m-%d')
latest_traceability
from device
- where device.management_number in
- <foreach collection="managementNumbers" index="index" open="(" separator="," close=")" item="val">
+ where device.id in
+ <foreach collection="deviceIds" index="index" open="(" separator="," close=")" item="val">
#{val}
</foreach>
+ order by field(device.id,
+ <foreach collection="deviceIds" index="index" separator="," item="val">
+ #{val}
+ </foreach>)
</select>
<update id="updateStatus">
@@ -278,6 +290,23 @@
select code
from standard_method
where id = #{id}
+ </select>
+ <select id="getStandardMethodReportText" resultType="java.lang.String">
+ select case
+ when name is null or trim(name) = '' then code
+ else concat(code, '銆�', name, '銆�')
+ end
+ from standard_method
+ where id = #{id}
+ </select>
+ <select id="getStandardMethodReportTextByCode" resultType="java.lang.String">
+ select case
+ when name is null or trim(name) = '' then code
+ else concat(code, '銆�', name, '銆�')
+ end
+ from standard_method
+ where code = #{code}
+ limit 1
</select>
<select id="selLaboratoryCode" resultType="java.lang.String">
select laboratory_code
@@ -388,10 +417,11 @@
from (select io2.id insOrderId,
io2.sample_view,
io2.production,
- io2.send_time,
+ io2.sample_date,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
io2.prepare_user,
io2.entrust_code,
+ GROUP_CONCAT(DISTINCT isa.sample_code SEPARATOR ' ') AS sample_code,
io2.test_quantity,
io2.ins_state,
JSON_OBJECT(
@@ -414,7 +444,7 @@
from ( <include refid="selectInsOrderExport"/>
where (io.ifs_inventory_id IS NULL OR TRIM(io.ifs_inventory_id) = '')
<if test="isOrderAll != null and isOrderAll != ''">
- AND io.state in (1, 4)
+ AND io.state in (1, 4, 5)
</if>
<if test="laboratory!=null and laboratory!=''">
AND io.laboratory=#{laboratory}
--
Gitblit v1.9.3