From e29f147aab5b0b0b794d611b522b67b94423e3cf Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 17:56:57 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/resources/mapper/PlanMapper.xml | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/PlanMapper.xml b/inspection-server/src/main/resources/mapper/PlanMapper.xml
index 16f3557..cf40804 100644
--- a/inspection-server/src/main/resources/mapper/PlanMapper.xml
+++ b/inspection-server/src/main/resources/mapper/PlanMapper.xml
@@ -1,47 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.PlanMapper">
- <resultMap id="selectAllPlanMap" type="map" >
+ <resultMap id="selectAllPlanMap" type="map">
<id property="code" column="code"/>
- <result property="inspectionStatus" column="inspectionStatus"/>
+ <result property="id" column="id"/>
+ <result property="samplename" column="samplename"/>
+ <result property="testState" column="inspectionStatus"/>
<result property="startTime" column="startTime"/>
<result property="endTime" column="endTime"/>
- <collection property="father" resultMap="selectAllPlanMapTowMap" javaType="List"/>
- </resultMap>
- <resultMap id="selectAllPlanMapTowMap" type="map">
- <id property="samplename" column="samplename"/>
- <collection property="chldren" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
+ <collection property="children" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
</resultMap>
<resultMap id="selectAllPlanMapTowsMap" type="map">
- <id property="id" column="id"/>
+ <id property="pid" column="pid"/>
<result property="name" column="name"/>
<result property="unit" column="unit"/>
<result property="required" column="required"/>
<result property="internal" column="internal"/>
+ <result property="testValue" column="testValue"/>
<result property="testState" column="testState"/>
+ <result property="uId" column="uId"/>
<result property="checker" column="checker"/>
+ <result property="isuId" column="isuId"/>
<result property="instrumentname" column="instrumentname"/>
+ <result property="classId" column="classId"/>
</resultMap>
<!--鏌ヨ妫�楠岃鍒�-->
<select id="selectAllPlan" resultMap="selectAllPlanMap">
- select ip.id,
+ select i.id ,
i.code,
inspection_status inspectionStatus,
DATE_FORMAT(start_time,'%Y-%m-%d') startTime,
DATE_FORMAT(end_time,'%Y-%m-%d') endTime,
im.name samplename,
+ ip.id pid,
ip.name,
ip.unit,
required,
internal,
+ test_value testValue,
test_state testState,
+ u.id uId,
u.name checker,
+ isu.id isuId,
+ isu.classify_id classId,
equipment_name instrumentname
from lims_laboratory.inspection_product ip
left join lims_laboratory.inspection_material im on ip.inspection_material_id = im.id
left join lims_laboratory.inspection i on im.inspection_id = i.id
left join lims_laboratory.user u on ip.user_id = u.id
- left join lims_laboratory.instrument isu on ip.instrument_id = isu.id
+ left join lims_laboratory.instrument isu on ip.instrument_id = isu.id
<where>
<if test="code != null and code != null">
and i.code like concat('%',#{code},'%')
@@ -52,6 +59,9 @@
<if test="beginTime != null and endTime != null">
and i.start_time between #{beginTime} and #{endTime}
</if>
+ <if test="isLookMe != false and id != null">
+ and ip.user_id=#{id}
+ </if>
</where>
</select>
</mapper>
--
Gitblit v1.9.3