yinrw
3 天以前 f8913a0b4dd441c74c3dd82306a65708a4b1597e
修改多个模块页面展示逻辑
已修改6个文件
9 ■■■■■ 文件已修改
src/main/resources/mapper/approve/ApproveProcessMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/device/DeviceRepairMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/production/ProductOrderMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/production/ProductWorkOrderMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/production/ProductionProductMainMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/quality/QualityInspectMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/approve/ApproveProcessMapper.xml
@@ -38,5 +38,6 @@
        <if test="req.approveType != null ">
            and approve_type = #{req.approveType}
        </if>
        order by approve_time desc
    </select>
</mapper>
src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -50,6 +50,7 @@
                and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
            </if>
        </where>
        order by dr.repair_time desc
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
        select dr.id,
src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -126,6 +126,7 @@
            </if>
        </where>
        GROUP BY po.id
        order by po.create_time desc
    </select>
src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -49,7 +49,7 @@
                and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
            </if>
        </where>
        order by pwo.id desc
        ORDER BY MAX(pwo.id) OVER (PARTITION BY po.nps_no) DESC, ppri.drag_sort ASC
    </select>
    <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
        SELECT
src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -94,7 +94,7 @@
                and ppm.status = #{c.status}
            </if>
        </where>
        order by ppm.id
        order by ppm.create_time desc
    </select>
    <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -96,7 +96,7 @@
        <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
            AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
        </if>
        ORDER BY qi.check_time DESC
        ORDER BY IF(qi.check_time IS NULL, 1, 0) ASC, qi.check_time DESC, qi.create_time DESC
    </select>
    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">