From da30df12fc02f28a4b016c8c35a3b57e5c29fe35 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 13:56:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/resources/mapper/InspectionMapper.xml | 77 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 19 deletions(-)
diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index 8ba9919..d324cf1 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -1,23 +1,62 @@
-<?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">
+<?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.InspectionMapper">
- <select id="selectAllInspection" resultType="com.yuanchu.limslaboratory.pojo.dto.InspectionDto">
- select i.id, type, inspection_status, qualified_state, i.create_time, user_name, inspect_start_time, inspect_end_time, u.name inspectUserName
- from inspection i left join user u
- on i.inspect_user_id = u.id
- <if test="state!=null">
- where state = #{state}
- </if>
- order by i.create_time desc
- limit #{pageSize},#{countSize}
- </select>
- <select id="selectInspectToCount" resultType="java.lang.Integer">
- select count(*)
- from inspection i left join user u
- on i.inspect_user_id = u.id
- <if test="state!=null">
- where state = #{state}
+ <select id="selectInspectsList" resultType="map">
+ select i.id,
+ i.code icode,
+ type,
+ DATE_FORMAT(`form_time`,'%Y-%m-%d'),
+ supplier,
+ im.code mcode,
+ im.name,
+ specifications,
+ unit,
+ num,
+ DATE_FORMAT(i.`create_time`,'%Y-%m-%d'),
+ u.name userName,
+ inspection_status,
+ DATE_FORMAT(i.`start_time`,'%Y-%m-%d'),
+ DATE_FORMAT(i.`end_time`,'%Y-%m-%d')
+ from lims_laboratory.inspection i
+ join lims_laboratory.user u on i.user_id = u.id
+ join lims_laboratory.inspection_material im on i.id = im.inspection_id
+ where i.state=1
+ <if test="message!=null">
+ and i.code like concat('%', #{message}, '%')
+ or im.name like concat('%', #{message}, '%')
</if>
</select>
-</mapper>
+ <!--璁＄畻妫�楠岀殑妫�楠屽崟鏁伴噺-->
+ <select id="seleCountIns" resultType="java.lang.Integer">
+ select count(id)
+ from lims_laboratory.inspection
+ where state = 1
+ and inspection_status in (0, 1)
+ </select>
+
+ <!--璁＄畻鏈楠岀殑妫�楠屽崟鏁伴噺-->
+ <select id="seleCountUnIns" resultType="java.lang.Integer">
+ select count(id)
+ from lims_laboratory.inspection
+ where state = 1
+ and inspection_status is null
+ </select>
+
+ <!--鑾峰彇妫�楠屽崟鎬绘暟-->
+ <select id="getcount" resultType="java.lang.Integer">
+ select count(id)
+ from lims_laboratory.inspection
+ where state = 1
+ </select>
+
+ <!--妫�楠岀粨璁�,妫�楠屾暟閲�-->
+ <select id="getResultNum" resultType="java.util.Map">
+ select inspection_status result,
+ count(id) num
+ from lims_laboratory.inspection
+ where state=1
+ group by result
+ order by num desc
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3