Compare commits

...

2 Commits

Author SHA1 Message Date
曹鹏飞 c12a548bd1 fix(QmsInspectionStandard): 修正检测标准项创建用户信息保存
- 设置检测标准项的创建用户ID
- 设置检测标准项的创建用户名
- 设置检测标准项的创建时间
- 完善检测标准项信息后保存至数据库
2026-05-12 14:27:07 +08:00
曹鹏飞 71a989bb20 fix(repository): 修正QmsIncomingInspectionTask中过期过滤条件
- 将isOverdue过滤条件从<if>移动到<choose>的<when>分支中
- 消除重复的isOverdue过滤判断,避免条件冲突
- 优化查询条件逻辑,提高代码可读性和维护性
2026-05-12 14:16:53 +08:00
2 changed files with 6 additions and 3 deletions

View File

@ -390,6 +390,9 @@ public class QmsInspectionStandardControllerService {
inspectionStandardItem.setDetectionTypeDictItemId(detectionTypeDictItemId); inspectionStandardItem.setDetectionTypeDictItemId(detectionTypeDictItemId);
inspectionStandardItem.setSortNo(0); inspectionStandardItem.setSortNo(0);
inspectionStandardItem.setName(data.getKey().getInspectionItemName()); inspectionStandardItem.setName(data.getKey().getInspectionItemName());
inspectionStandardItem.setCreateUserId(userId);
inspectionStandardItem.setCreateUserName(userName);
inspectionStandardItem.setCreateTime(now);
inspectionStandardItemService.save(inspectionStandardItem); inspectionStandardItemService.save(inspectionStandardItem);
inspectionStandardItemContentService.saveBatch( inspectionStandardItemContentService.saveBatch(
data.getValue() data.getValue()

View File

@ -149,6 +149,9 @@
LEFT JOIN qms_incoming_inspection_task t2 ON t.related_task_id = t2.id LEFT JOIN qms_incoming_inspection_task t2 ON t.related_task_id = t2.id
<where> <where>
<choose> <choose>
<when test="request.isOverdue != null">
t.is_overdue = #{request.isOverdue}
</when>
<when test="request.inspectionStatus != null"> <when test="request.inspectionStatus != null">
t.inspection_status = #{request.inspectionStatus} t.inspection_status = #{request.inspectionStatus}
</when> </when>
@ -157,9 +160,6 @@
</otherwise> </otherwise>
</choose> </choose>
AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId}) AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId})
<if test="request.isOverdue != null">
AND t.is_overdue = #{request.isOverdue}
</if>
<if test="request.key != null and request.key != ''"> <if test="request.key != null and request.key != ''">
AND (m.material_no ilike concat('%', #{request.key}, '%') AND (m.material_no ilike concat('%', #{request.key}, '%')
or m.material_desc ilike concat('%', #{request.key}, '%') or m.material_desc ilike concat('%', #{request.key}, '%')