fix(qms): 修复COA审核状态校验并新增工单处理完成查询过滤
- 修复COA审核时状态校验逻辑,排除状态3的数据 - 新增工单待办项查询对象中的hasProcessed字段 - 在工单待办项查询SQL中添加hasProcessed过滤条件 - 完善异常提示信息,明确待提交状态要求
This commit is contained in:
parent
446c74b9db
commit
4c80407a2a
|
|
@ -19,4 +19,9 @@ public class QmsIssueTicketTodoItemSearchQO extends SearchBaseQO {
|
||||||
* 来源类型:0=IQC检测任务,1=PDI检测任务,2=巡检,3=PQC检测任务
|
* 来源类型:0=IQC检测任务,1=PDI检测任务,2=巡检,3=PQC检测任务
|
||||||
*/
|
*/
|
||||||
private Integer sourceType;
|
private Integer sourceType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否处理完成
|
||||||
|
*/
|
||||||
|
private Boolean hasProcessed;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl<QmsCoaReviewMapper, Qms
|
||||||
|
|
||||||
Set<Long> taskIds = new java.util.HashSet<>();
|
Set<Long> taskIds = new java.util.HashSet<>();
|
||||||
for (QmsCoaReview r : reviews) {
|
for (QmsCoaReview r : reviews) {
|
||||||
if (!Objects.equals(r.getStatus(), 0)) {
|
if (!Objects.equals(r.getStatus(), 0) && !Objects.equals(r.getStatus(), 3)) {
|
||||||
throw new NflgException(STATE.BusinessError, "ID=" + r.getId() + " 的记录不是待提交状态,无法提交");
|
throw new NflgException(STATE.BusinessError, "ID=" + r.getId() + " 的记录不是待提交状态,无法提交");
|
||||||
}
|
}
|
||||||
// 校验供应商权限
|
// 校验供应商权限
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,9 @@
|
||||||
<if test="request.sourceType != null">
|
<if test="request.sourceType != null">
|
||||||
AND vit.source_type = #{request.sourceType}
|
AND vit.source_type = #{request.sourceType}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="request.hasProcessed != null">
|
||||||
|
AND itd.has_processed = #{request.hasProcessed}
|
||||||
|
</if>
|
||||||
<if test="request.title != null and request.title != ''">
|
<if test="request.title != null and request.title != ''">
|
||||||
AND vit.ticket_title ilike concat('%', #{request.title}, '%')
|
AND vit.ticket_title ilike concat('%', #{request.title}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue