From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-process/src/main/resources/mapper/ProcessReportMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
index 62e82d0..d40c71a 100644
--- a/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessReportMapper.xml
@@ -5,8 +5,6 @@
<resultMap id="BaseResultMap" type="com.ruoyi.process.pojo.ProcessReport">
<id column="id" property="id"/>
<result column="ins_report_code" property="insReportCode"/>
- <result column="pages" property="pages"/>
- <result column="number" property="number"/>
<result column="send" property="send"/>
<result column="method" property="method"/>
<result column="send_time" property="sendTime"/>
@@ -19,19 +17,65 @@
<result column="update_time" property="updateTime"/>
</resultMap>
<select id="pageProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
- select * from (select cpr.* ,
+ select * from (select cpr.id,
+ cpr.ins_report_code,
+ cpr.send,
+ case io.report_delivery
+ when 1 then '鑷彇'
+ when 2 then '蹇��'
+ when 3 then '鐢靛瓙浼犻��'
+ else cpr.method
+ end method,
+ cpr.send_time,
+ cpr.send_user,
+ cpr.signatory,
+ cpr.remark,
+ cpr.create_user,
+ cpr.create_time,
+ cpr.update_user,
+ cpr.update_time,
+ cpr.inspection_order_id,
+ cpr.receive_date,
+ cpr.receive_user,
u1.name sendUserName
from cnas_process_report cpr
- left join user u1 on send_user=u1.id )A
+ left join user u1 on send_user=u1.id
+ inner join ins_report ir on ir.code = cpr.ins_report_code
+ and ir.ins_order_id = cpr.inspection_order_id
+ and ir.is_ratify = 1 and ir.is_pass = 1
+ left join ins_order io on io.id = ir.ins_order_id )A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
<select id="exportProcessReport" resultType="com.ruoyi.process.dto.ProcessReportDto">
select ROW_NUMBER() OVER (ORDER BY cpr.id) AS indexs,
- cpr.* ,
+ cpr.id,
+ cpr.ins_report_code,
+ cpr.send,
+ case io.report_delivery
+ when 1 then '鑷彇'
+ when 2 then '蹇��'
+ when 3 then '鐢靛瓙浼犻��'
+ else cpr.method
+ end method,
+ cpr.send_time,
+ cpr.send_user,
+ cpr.signatory,
+ cpr.remark,
+ cpr.create_user,
+ cpr.create_time,
+ cpr.update_user,
+ cpr.update_time,
+ cpr.inspection_order_id,
+ cpr.receive_date,
+ cpr.receive_user,
u1.signature_url sendUserUrl
from cnas_process_report cpr
left join user u1 on send_user=u1.id
+ inner join ins_report ir on ir.code = cpr.ins_report_code
+ and ir.ins_order_id = cpr.inspection_order_id
+ and ir.is_ratify = 1 and ir.is_pass = 1
+ left join ins_order io on io.id = ir.ins_order_id
</select>
</mapper>
--
Gitblit v1.9.3