Compare commits

..

No commits in common. "81bb321ce7fed71a87e215f5ed58cbdf06cf4176" and "8fc926f7ffcf2dcbec7146d54aed7e78a45176d8" have entirely different histories.

3 changed files with 8 additions and 11 deletions

View File

@ -300,9 +300,9 @@ public class QmsIssueTicketControllerService {
throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在"); throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在");
} }
// 2. 校验任务状态必须为3待流转或4逾期 // 2. 校验任务状态必须为3待流转
if (!Objects.equals(taskRecord.getInspectionEnable(), 3) && !Objects.equals(taskRecord.getInspectionEnable(), 4)) { if (!Objects.equals(taskRecord.getInspectionEnable(), 3)) {
throw new NflgException(STATE.BusinessError, "只有待流转或逾期状态的任务才能创建工单,当前状态:" + taskRecord.getInspectionEnable()); throw new NflgException(STATE.BusinessError, "只有待流转状态的任务才能创建工单,当前状态:" + taskRecord.getInspectionEnable());
} }
// 3. 校验是否已存在工单 // 3. 校验是否已存在工单
@ -923,9 +923,9 @@ public class QmsIssueTicketControllerService {
throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在"); throw new NflgException(STATE.BusinessError, "PDI检测任务记录不存在");
} }
// 校验任务状态必须为3待流转或4逾期 // 校验任务状态必须为3待流转
if (!Objects.equals(taskRecord.getInspectionEnable(), 3) && !Objects.equals(taskRecord.getInspectionEnable(), 4)) { if (!Objects.equals(taskRecord.getInspectionEnable(), 3)) {
throw new NflgException(STATE.BusinessError, "只有待流转或逾期状态的任务才能创建工单,当前状态:" + taskRecord.getInspectionEnable()); throw new NflgException(STATE.BusinessError, "只有待流转状态的任务才能创建工单,当前状态:" + taskRecord.getInspectionEnable());
} }
// 校验是否已存在工单同一taskRecordId只能创建一次工单 // 校验是否已存在工单同一taskRecordId只能创建一次工单

View File

@ -14,7 +14,7 @@ public class QmsPdiInspectionResultsSearchQO {
private String key; private String key;
/** /**
* 任务状态可选0=待流转1=质检中2=已完成3=待流转4=逾期根据overdue字段动态判断 * 任务状态可选0=待流转1=质检中2=已完成3=待流转逾期
*/ */
private Integer inspectionEnable; private Integer inspectionEnable;

View File

@ -32,12 +32,9 @@
) )
</if> </if>
<!-- 任务状态筛选 --> <!-- 任务状态筛选 -->
<if test="request.inspectionEnable != null and request.inspectionEnable != 4"> <if test="request.inspectionEnable != null">
AND t.inspection_enable = #{request.inspectionEnable} AND t.inspection_enable = #{request.inspectionEnable}
</if> </if>
<if test="request.inspectionEnable != null and request.inspectionEnable == 4">
AND t.overdue = true
</if>
</where> </where>
ORDER BY t.id DESC ORDER BY t.id DESC
</select> </select>