From 66990e9be43f71b89aa42065d696b682d803afa6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 10:07:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml b/cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml
index 2906809..2456122 100644
--- a/cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessComplainMapper.xml
@@ -6,7 +6,7 @@
<id column="id" property="id"/>
<result column="complain_no" property="complainNo"/>
<result column="complain_name" property="complainName"/>
- <result column="ins_report_id" property="insReportId"/>
+ <result column="ins_report" property="insReport"/>
<result column="sample_code" property="sampleCode"/>
<result column="create_user" property="createUser"/>
<result column="complainant" property="complainant"/>
@@ -40,7 +40,6 @@
</select>
<select id="getProcessComplain" resultType="com.yuanchu.mom.dto.ProcessComplainDto">
select cpc.*,
- ir.code,
u1.name complainant,
u1.phone,
u1.email,
@@ -56,7 +55,6 @@
left join user u4 on cpc.cause_analysis_user = u4.id
left join user u5 on cpc.corrective_action_user = u5.id
left join user u6 on cpc.corrective_action_confirmation_user = u6.id
- left join ins_report ir on cpc.ins_report_id = ir.id
where cpc.id=#{id}
</select>
</mapper>
--
Gitblit v1.9.3