From df2ff592a5b9037a747032f3351836e0c61fb4f9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 08:59:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
index 78aaaa6..fc680d0 100644
--- a/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
+++ b/src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml
@@ -2,48 +2,54 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerMapper">
- <select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.dto.MeasuringInstrumentLedgerPageDto">
+ <select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger">
SELECT
- mil.id,
- mil.user_id,
- mil.user_name,
- mil.code,
- sd.dept_name,
- mil.installation_location,
- mil.unit,
- mil.cycle,
- mil.name,
- mil.model,
- mil.most_date,
- mil.valid,
- mil.next_date,
- mil.record_date,
- mil.create_user,
- mil.create_time,
- mil.update_user,
- mil.update_time,
- mil.tenant_id
+ id,
+ user_id,
+ user_name,
+ code,
+ name,
+ model,
+ most_date,
+ valid,
+ next_date,
+ record_date,
+ CASE
+ WHEN next_date >= DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
+ ELSE 2
+ END AS status,
+ create_user,
+ create_time,
+ update_user,
+ update_time,
+ tenant_id
FROM
- measuring_instrument_ledger mil
- left join sys_dept sd on sd.id = mil.dept_id
+ measuring_instrument_ledger
<where>
<!-- 鏌ヨ鏉′欢鍚屼笂 -->
<if test="req.code != null and req.code != ''">
- AND mil.code LIKE CONCAT('%', #{req.code}, '%')
+ AND code LIKE CONCAT('%', #{req.code}, '%')
</if>
<if test="req.name != null and req.name != ''">
- AND mil.name LIKE CONCAT('%', #{req.name}, '%')
+ AND name LIKE CONCAT('%', #{req.name}, '%')
</if>
<if test="req.status != null">
- AND mil.status = #{req.status}
+ <choose>
+ <when test="req.status == 1">
+ AND next_date >= DATE_FORMAT(now(),'%Y-%m-%d')
+ </when>
+ <when test="req.status == 2">
+ AND next_date < DATE_FORMAT(now(),'%Y-%m-%d')
+ </when>
+ </choose>
</if>
<if test="req.tenantId != null">
- AND mil.tenant_id = #{req.tenantId}
+ AND tenant_id = #{req.tenantId}
</if>
<if test="req.recordDate != null">
- AND mil.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
+ AND record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
</if>
</where>
- ORDER BY mil.update_time DESC
+ ORDER BY update_time DESC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3