From 0afd6c073589d5221774dab5cf4a9d21415ec0e8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 18:00:44 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/ReportMapper.xml | 84 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 34 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 708ac38..25a09a3 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -4,17 +4,21 @@
<!--鏌ヨ妫�楠屾姤鍛�-->
<select id="selectAllReport" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportVo">
- select im.code materialCode,
+ select r.id,
+ im.code materialCode,
r.code reportCode,
i.code inspectionCode,
+ im.name materialName,
+ r.conclusion,
+ r.status,
r.approver approver,
- r.status status,
- r.conclusion conclusion,
- u.name name
- from report r
- join inspection i on r.inspection_id = i.id
- join user u on i.user_id = u.id
- join inspection_material im on i.id = im.inspection_id
+ i.type,
+ check_time,
+ u.name
+ from lims_laboratory.report r
+ join lims_laboratory.inspection i on r.inspection_id = i.id
+ join lims_laboratory.user u on i.user_id = u.id
+ join lims_laboratory.inspection_material im on i.id = im.inspection_id
<where>
r.state = 1
<if test="status != null">
@@ -26,33 +30,45 @@
or r.code like concat('%', #{name}, '%')
</if>
</where>
+ order by r.id
</select>
- <!--鏌ヨ鎶ュ憡瀹℃牳-->
- <select id="selectAllReportAuditing" resultType="com.yuanchu.limslaboratory.pojo.vo.ReportAuditingVo">
- select im.code materialCode,
- r.code reportCode,
- im.name materialName,
- r.status status,
- r.approver approver,
- DATE_FORMAT(r.`create_time`, '%Y-%m-%d') submitTime,
- DATE_FORMAT(r.`check_time`, '%Y-%m-%d') checkTime
- from report r
- join inspection i on r.inspection_id = i.id
- join inspection_material im on i.id = im.inspection_id
- <where>
- r.state = 1
- <if test="status == null">
- and r.status in (0, 1)
- </if>
- <if test="status != null">
- and r.status = #{status}
- </if>
- <if test="name != null and name != ''">
- and im.code like concat('%', #{name}, '%')
- or i.code like concat('%', #{name}, '%')
- or im.name like concat('%', #{name}, '%')
- </if>
- </where>
+ <resultMap id="report" type="map">
+ <id property="rcode" column="rcode"/>
+ <result property="name" column="name"/>
+ <result property="specifications" column="specifications"/>
+ <result property="supplier" column="supplier"/>
+ <result property="insCode" column="ins_code"/>
+ <result property="type" column="type"/>
+ <result property="imCode" column="im_code"/>
+ <result property="createTime" column="create_time"/>
+ <result property="checkTime" column="check_time"/>
+ <result property="inspectionStatus" column="inspection_status"/>
+ <collection property="products" resultMap="products" javaType="java.util.List"/>
+ </resultMap>
+
+ <resultMap id="products" type="map">
+ <id property="code" column="id"/>
+ <result property="ipName" column="ip_name"/>
+ <result property="unit" column="unit"/>
+ <result property="required" column="required"/>
+ <result property="testValue" column="test_value"/>
+ <result property="testState" column="test_state"/>
+ </resultMap>
+
+ <select id="getReportContext" resultMap="report">
+ SELECT r.`code` rcode,date_format(r.create_time, '%Y-%m-%d') create_time,date_format(r.check_time, '%Y-%m-%d') check_time,i.inspection_status,im.`name`,im.specifications,im.supplier,im.`code` im_code,i.`code` ins_code,i.type,ip.id,ip.`name` ip_name,ip.unit,ip.required,ip.test_value,ip.test_state
+ FROM report r
+ LEFT JOIN inspection i
+ ON r.inspection_id = i.id
+ LEFT JOIN inspection_material im
+ ON im.inspection_id = i.id
+ LEFT JOIN inspection_product ip
+ ON ip.inspection_material_id = im.id
+ WHERE ip.state != 0
+ and im.state != 0
+ and i.state != 0
+ and r.`code` = #{code}
</select>
+
</mapper>
--
Gitblit v1.9.3