From 7b09f233bde70508f6db7e08e983e9a2c4bb3e99 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 11 八月 2023 17:50:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index f8bfd64..e2d212b 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -3,7 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.RawInspectMapper">
-
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.RawInspect">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
@@ -21,8 +20,9 @@
<result property="formTime" column="form_time" jdbcType="DATE"/>
</resultMap>
<select id="selectRawInspectsByLimit" resultType="com.yuanchu.mom.pojo.RawInspect">
- select id, code, name, specifications, unit, number, ins_state, judge_state, ins_time, user_name, create_time, form_time
- from raw_inspect
+ select id, code, name, specifications, unit, number, ins_state, judge_state, ins_time, user_name, create_time,
+ form_time
+ from mom_ocean.raw_inspect
where state = 1
<if test="formTime!=null and formTime!=''">
and form_time = #{formTime}
@@ -36,6 +36,7 @@
<if test="judgeState!=2">
and judge_state = #{judgeState}
</if>
+ order by id desc
limit #{pageSize},#{countSize}
</select>
</mapper>
--
Gitblit v1.9.3