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

gaoluyang

2 天以前 feb347e6c4f94fa7becf9072a685d3ce0c3464fd

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

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

@@ -4,64 +4,66 @@

    <select id="listPage" resultType="com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger">
        SELECT
        id,
        user_id,
        user_name,
        code,
        name,
        model,
        most_date,
        valid,
        next_date,
        record_date,
        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 most_date IS NOT NULL
        AND valid IS NOT NULL
        AND DATE_ADD(most_date, INTERVAL valid DAY) &gt;= CURDATE() THEN 1
        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,
        create_user,
        create_time,
        update_user,
        update_time,
        tenant_id,
        unit,
        dept_id,
        instation_location,
        cycle
        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
        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 code LIKE CONCAT('%', #{req.code}, '%')
                AND t.code LIKE CONCAT('%', #{req.code}, '%')
            </if>
            <if test="req.name != null and req.name != ''">
                AND name LIKE CONCAT('%', #{req.name}, '%')
                AND t.name LIKE CONCAT('%', #{req.name}, '%')
            </if>
            <if test="req.status != null">
                <choose>
                    <when test="req.status == 1">
                        AND most_date IS NOT NULL
                        AND valid IS NOT NULL
                        AND DATE_ADD(most_date, INTERVAL valid DAY) &gt;= CURDATE()
                        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 (
                        most_date IS NULL
                        OR valid IS NULL
                        OR DATE_ADD(most_date, INTERVAL valid DAY) &lt; CURDATE()
                        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 tenant_id = #{req.tenantId}
                AND t.tenant_id = #{req.tenantId}
            </if>
            <if test="req.recordDate != null">
                AND record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
                AND t.record_date = DATE_FORMAT(#{req.recordDate},'%Y-%m-%d')
            </if>
        </where>
        ORDER BY create_time DESC
        ORDER BY t.create_time DESC
    </select>
</mapper>

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

@@ -7,7 +7,8 @@
        SELECT
        t1.id,
        t1.user_id,
        t1.user_name,
        <!-- user_name 存的是登录账号，这里改取用户昵称；取不到时回退为原值 -->
        IFNULL(su.nick_name, t1.user_name) AS user_name,
        t2.code,
        t2.name,
        t2.model,
@@ -17,6 +18,7 @@
        FROM
        measuring_instrument_ledger_record t1
        left join measuring_instrument_ledger t2 on t1.measuring_instrument_ledger_id = t2.id
        left join sys_user su on t1.user_id = su.user_id
        <where>
            <!-- 查询条件同上 -->
            <if test="req.code != null and req.code != ''">
@@ -38,7 +40,8 @@
        SELECT
        t1.id,
        t1.user_id,
        t1.user_name,
        <!-- user_name 存的是登录账号，这里改取用户昵称；取不到时回退为原值 -->
        IFNULL(su.nick_name, t1.user_name) AS user_name,
        t2.code,
        t2.name,
        t2.model,
@@ -48,6 +51,7 @@
        FROM
        measuring_instrument_ledger_record t1
        left join measuring_instrument_ledger t2 on t1.measuring_instrument_ledger_id = t2.id
        left join sys_user su on t1.user_id = su.user_id
        <where>
            <!-- 查询条件同上 -->
            <if test="req.code != null and req.code != ''">