From 7787f57521297df847bfd5f2b9af410b3fdac67e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 十月 2026 16:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 3f6eabd..8c68db8 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -3,6 +3,27 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.inspect.mapper.InsOrderMapper">
+ <update id="updateInspectionOrderEntrustCode">
+ UPDATE cnas_inspection_order
+ SET entrust_code = #{entrustCode}
+ WHERE ins_order_id = #{orderId}
+ </update>
+
+ <select id="selectQualityMonitorEvaluatorId" resultType="java.lang.Integer">
+ SELECT cqmd.evaluator_user_id
+ FROM ins_order io
+ JOIN cnas_quality_monitor_details cqmd
+ ON cqmd.quality_monitor_details_id = io.quality_monitor_details_id
+ WHERE io.id = #{orderId}
+ </select>
+
+ <select id="selectQualityMonitorInspectorId" resultType="java.lang.Integer">
+ SELECT cqmd.inspector_user_id
+ FROM ins_order io
+ JOIN cnas_quality_monitor_details cqmd
+ ON cqmd.quality_monitor_details_id = io.quality_monitor_details_id
+ WHERE io.id = #{orderId}
+ </select>
<resultMap id="selectSampleDefectsMap" type="com.ruoyi.inspect.vo.SampleDefectsFatherVo">
<id column="id" property="id"/>
@@ -417,6 +438,7 @@
from (select io2.id insOrderId,
io2.sample_view,
io2.production,
+ io2.sample_status,
io2.sample_date,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
io2.prepare_user,
--
Gitblit v1.9.3