Compare commits

..

No commits in common. "c12a548bd16ac618af32e64878627f4d9cf0a321" and "d0fb34dc71e32946ed86729ba797a6f96f5654a6" have entirely different histories.

2 changed files with 3 additions and 6 deletions

View File

@ -390,9 +390,6 @@ 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,9 +149,6 @@
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>
@ -160,6 +157,9 @@
</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}, '%')