From 8c37d903a2fe25d5857c4555c791d552bec60cb8 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 22 八月 2023 17:48:44 +0800 Subject: [PATCH] 改动6.0 --- inspection-server/src/main/resources/mapper/InspectionProductMapper.xml | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml index 4fd8ea4..f1b39da 100644 --- a/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml +++ b/inspection-server/src/main/resources/mapper/InspectionProductMapper.xml @@ -1,12 +1,7 @@ <?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.InspectionProductMapper"> - <update id="upda"> - update lims_laboratory.inspection_product - set test_state=null - where id = #{id} - and state = 1 - </update> + <!--鏍规嵁妫�楠屽崟id鏌ヨ妫�楠岄」鐩殑妫�楠岀粨鏋�--> <select id="getresult" resultType="java.lang.Integer"> @@ -41,16 +36,18 @@ <!--鑾峰彇妫�楠岄」鐩�,璁惧,妫�楠屽紑濮嬫椂闂�,鎵ц浜�,妫�楠岀粨鏉熸椂闂�--> <select id="getResultNum" resultType="java.util.Map"> select ip.name, - equipment_name instrumentname, - start_time startTime, - user.name checkname, - end_time endTime + equipment_name instrumentname, + DATE_FORMAT(start_time, '%Y-%m-%d') startTime, + user.name checkname, + DATE_FORMAT(end_time, '%Y-%m-%d') endTime from lims_laboratory.inspection_product ip left join lims_laboratory.inspection_material on ip.inspection_material_id = inspection_material.id left join lims_laboratory.inspection i on inspection_material.inspection_id = i.id left join lims_laboratory.instrument on ip.instrument_id = instrument.id left join lims_laboratory.user on ip.user_id = user.id - where ip.state=1 - and test_state is null + where ip.state = 1 + and test_state is null + order by start_time + limit 4 </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3