yys 1.设备区域 2.设备巡检，维保，保养多选 3.数采

云

5 天以前 d17d4d1ac98865d2a71b4f24771b7b76e0839ed3

 src/main/resources/mapper/measuringinstrumentledger/MeasuringInstrumentLedgerMapper.xml

@@ -15,7 +15,7 @@
        next_date,
        record_date,
        CASE
        WHEN most_date >=  DATE_FORMAT(now(),'%Y-%m-%d') THEN 1
        WHEN DATE_ADD(most_date, INTERVAL IFNULL(cycle, 0) DAY) >= CURDATE() THEN 1
        ELSE 2
        END AS status,
        create_user,
@@ -40,10 +40,10 @@
            <if test="req.status != null">
                <choose>
                    <when test="req.status == 1">
                        AND most_date &gt;=  DATE_FORMAT(now(),'%Y-%m-%d')
                        AND DATE_ADD(most_date, INTERVAL IFNULL(cycle, 0) DAY) &gt;= CURDATE()
                    </when>
                    <when test="req.status == 2">
                        AND most_date &lt;  DATE_FORMAT(now(),'%Y-%m-%d')
                        AND DATE_ADD(most_date, INTERVAL IFNULL(cycle, 0) DAY) &lt; CURDATE()
                    </when>
                </choose>
            </if>