天津-奇缘恒艺 录数据需求修改

gaoluyang

4 天以前 4ba399c0159d7dceff8f95beb05fb1a92dbda049

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

@@ -2,48 +2,68 @@
        "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
        t.id,
        t.user_id,
        <!-- user_name 存的是登录账号，这里改取用户昵称；取不到时回退为原值 -->
        IFNULL(su.nick_name, t.user_name) AS user_name,
        t.code,
        t.name,
        t.model,
        t.most_date,
        t.valid,
        t.next_date,
        t.record_date,
        CASE
        WHEN t.most_date IS NOT NULL
        AND t.valid IS NOT NULL
        AND DATE_ADD(t.most_date, INTERVAL t.valid DAY) &gt;= CURDATE() THEN 1
        ELSE 2
        END AS status,
        t.create_user,
        t.create_time,
        t.update_user,
        t.update_time,
        t.tenant_id,
        t.unit,
        t.dept_id,
        t.instation_location,
        t.cycle
        FROM
        measuring_instrument_ledger mil
        left join sys_dept sd on sd.id = mil.dept_id
        measuring_instrument_ledger t
        LEFT JOIN sys_user su ON t.user_id = su.user_id
        <where>
            <!-- 查询条件同上 -->
            <if test="req.code != null and req.code != ''">
                AND mil.code LIKE CONCAT('%', #{req.code}, '%')
                AND t.code LIKE CONCAT('%', #{req.code}, '%')
            </if>
            <if test="req.name != null and req.name != ''">
                AND mil.name LIKE CONCAT('%', #{req.name}, '%')
                AND t.name LIKE CONCAT('%', #{req.name}, '%')
            </if>
            <if test="req.status != null">
                AND mil.status = #{req.status}
                <choose>
                    <when test="req.status == 1">
                        AND t.most_date IS NOT NULL
                        AND t.valid IS NOT NULL
                        AND DATE_ADD(t.most_date, INTERVAL t.valid DAY) &gt;= CURDATE()
                    </when>
                    <when test="req.status == 2">
                        AND (
                        t.most_date IS NULL
                        OR t.valid IS NULL
                        OR DATE_ADD(t.most_date, INTERVAL t.valid DAY) &lt; CURDATE()
                        )
                    </when>
                </choose>
            </if>
            <if test="req.tenantId != null">
                AND mil.tenant_id = #{req.tenantId}
                AND t.tenant_id = #{req.tenantId}
            </if>
            <if test="req.recordDate != null">
                AND mil.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
                AND t.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
            </if>
        </where>
        ORDER BY mil.update_time DESC
        ORDER BY t.create_time DESC
    </select>
</mapper>
</mapper>