|
|
@@ -264,11 +264,14 @@
|
|
|
<if test="id!=null and id.size>0">
|
|
|
UNION
|
|
|
select
|
|
|
+ MATERIAL_TYPE_ID "operationsNameId",
|
|
|
+ MATERIAL_TYPE_NAME "operationsName",
|
|
|
MATERIAL_TYPE_ID "id",
|
|
|
MATERIAL_TYPE_ID "value",
|
|
|
MATERIAL_TYPE_NAME "label",
|
|
|
MATERIAL_TYPE_NAME "text",
|
|
|
- REMARK "remark"
|
|
|
+ REMARK "remark",
|
|
|
+ 'operationsName' "prop"
|
|
|
from RMS_MATERIAL_TYPE
|
|
|
where MATERIAL_TYPE_ID in
|
|
|
<foreach collection="id" item="item" open="(" close=")" separator="," >
|
|
|
@@ -637,7 +640,8 @@
|
|
|
RL.LINE_NAME "label",
|
|
|
RL.LINE_NAME "text",
|
|
|
NVL(RL_TEMP."points",'无') "points",
|
|
|
- RL.LINE_TYPE "lineType"
|
|
|
+ RL.LINE_TYPE "lineType",
|
|
|
+ 'lineName' "prop"
|
|
|
from RMS_LINE RL
|
|
|
LEFT JOIN
|
|
|
(
|
yourName