|
|
@@ -207,8 +207,6 @@
|
|
|
select * from(
|
|
|
select * from(
|
|
|
select
|
|
|
- MATERIAL_TYPE_ID "materialTypeId",
|
|
|
- MATERIAL_TYPE_NAME "materialTypeName",
|
|
|
MATERIAL_TYPE_ID "id",
|
|
|
MATERIAL_TYPE_ID "value",
|
|
|
MATERIAL_TYPE_NAME "label",
|
|
|
@@ -224,23 +222,12 @@
|
|
|
<if test="remark!=null and remark!=''">
|
|
|
AND REGEXP_LIKE("remark", #{remark})
|
|
|
</if>
|
|
|
- <if test="materialTypeId!=null and materialTypeId!=''">
|
|
|
- AND "materialTypeId" = #{materialTypeId}
|
|
|
- </if>
|
|
|
- <if test="id!=null and id.size>0 and !(index!=null and index!='')">
|
|
|
- AND "id" in
|
|
|
- <foreach collection="id" item="item" open="(" close=")" separator="," >
|
|
|
- #{item}
|
|
|
- </foreach>
|
|
|
- </if>
|
|
|
</where>
|
|
|
FETCH NEXT 10 ROWS ONLY
|
|
|
)
|
|
|
<if test="id!=null and id.size>0">
|
|
|
UNION
|
|
|
select
|
|
|
- MATERIAL_TYPE_ID "materialTypeId",
|
|
|
- MATERIAL_TYPE_NAME "materialTypeName",
|
|
|
MATERIAL_TYPE_ID "id",
|
|
|
MATERIAL_TYPE_ID "value",
|
|
|
MATERIAL_TYPE_NAME "label",
|
|
|
@@ -632,15 +619,13 @@
|
|
|
<select id="getMaterialByLike" resultType="java.util.Map">
|
|
|
select * from(
|
|
|
select
|
|
|
- RC.MATERIAL_ID "materialId",
|
|
|
- RC.MATERIAL_NAME "materialName",
|
|
|
RC.MATERIAL_ID "id",
|
|
|
RC.MATERIAL_ID "value",
|
|
|
RC.MATERIAL_NAME "label",
|
|
|
RC.MATERIAL_NAME "text"
|
|
|
from RMS_MATERIAL RC
|
|
|
- where DELETED = 0
|
|
|
<where>
|
|
|
+ DELETED = 0
|
|
|
<if test="index!=null and index!=''">
|
|
|
AND REGEXP_LIKE(RC.MATERIAL_NAME, #{index})
|
|
|
</if>
|
|
|
@@ -650,8 +635,6 @@
|
|
|
<if test="id!=null and id.size>0">
|
|
|
UNION
|
|
|
select
|
|
|
- RC.MATERIAL_ID "materialId",
|
|
|
- RC.MATERIAL_NAME "materialName",
|
|
|
RC.MATERIAL_ID "id",
|
|
|
RC.MATERIAL_ID "value",
|
|
|
RC.MATERIAL_NAME "label",
|
