Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

2 天以前 577fd97c572af76ac2464543e74e7edc2c35ffa0

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

@@ -22,7 +22,11 @@
        create_time,
        update_user,
        update_time,
        tenant_id
        tenant_id,
        unit,
        dept_id,
        instation_location,
        cycle
        FROM
        measuring_instrument_ledger
        <where>
@@ -36,10 +40,10 @@
            <if test="req.status != null">
                <choose>
                    <when test="req.status == 1">
                        AND next_date &gt;=  DATE_FORMAT(now(),'%Y-%m-%d')
                        AND most_date &gt;=  DATE_FORMAT(now(),'%Y-%m-%d')
                    </when>
                    <when test="req.status == 2">
                        AND next_date &lt;  DATE_FORMAT(now(),'%Y-%m-%d')
                        AND most_date &lt;  DATE_FORMAT(now(),'%Y-%m-%d')
                    </when>
                </choose>
            </if>