Browse Source

[fix]

品质管理 品质报告单
修改品质报告单列表查询mapper方法,添加根据审批状态排序语句;
修改品质报告单不合格分类实体类,修改报告导出字段为不良描述;
dev
王晓迪 1 month ago
parent
commit
370ef8235b
  1. 4
      ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReportUnqualified.java
  2. 2
      ruoyi-admin/src/main/resources/mapper/quality/QualityOrderReportMapper.xml

4
ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReportUnqualified.java

@ -55,8 +55,8 @@ public class QualityOrderReportUnqualified extends BaseEntity
@Excel(name = "不良数量")
private Integer processBadNum;
/** 不合格报告url */
@Excel(name = "不合格报告url")
/** 不良描述 */
@Excel(name = "不良描述")
private String unqualifiedReportUrl;
public void setOrderReportUnqualifiedId(Long orderReportUnqualifiedId)

2
ruoyi-admin/src/main/resources/mapper/quality/QualityOrderReportMapper.xml

@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
<if test="applyUser != null and applyUser != ''"> and apply_user = #{applyUser}</if>
</where>
order by create_time desc,audit_status asc
order by audit_status asc, create_time desc
</select>
<select id="selectQualityOrderReportById" parameterType="Long" resultMap="QualityOrderReportResult">

Loading…
Cancel
Save