浏览代码

中心中台融合 设备报表相关接口

lvxianyun 3 年之前
父节点
当前提交
34e642e31d
共有 1 个文件被更改,包括 11 次插入4 次删除
  1. 11 4
      dmp-business/dmp-rwd/src/main/resources/mapper/EquipmentReportMapper.xml

+ 11 - 4
dmp-business/dmp-rwd/src/main/resources/mapper/EquipmentReportMapper.xml

@@ -96,10 +96,12 @@
         join dt_relation re on obj.id = re.obj_to
         join dt_relation re on obj.id = re.obj_to
         join dt_define_type df on df.code = obj.class_code
         join dt_define_type df on df.code = obj.class_code
         where obj.valid=TRUE AND obj.obj_type='component' AND re.rel_code='Eq2Ec'
         where obj.valid=TRUE AND obj.obj_type='component' AND re.rel_code='Eq2Ec'
-        and df.project_id in
-        <foreach collection="projectIds" item="projectId" open="(" close=")" separator="," >
-            #{projectId}
-        </foreach>
+        <if test="projectIds != null and projectIds.size() &gt; 0" >
+            and df.project_id in
+            <foreach collection="projectIds" item="projectId" open="(" close=")" separator="," >
+                #{projectId}
+            </foreach>
+        </if>
         <if test="null!=equipmentId and equipmentId.length>0">
         <if test="null!=equipmentId and equipmentId.length>0">
             AND re.obj_from=#{equipmentId}
             AND re.obj_from=#{equipmentId}
         </if>
         </if>
@@ -138,6 +140,11 @@
         SELECT class_code as code ,(SELECT name FROM dt_define_type WHERE  code = class_code LIMIT 1 ) as name
         SELECT class_code as code ,(SELECT name FROM dt_define_type WHERE  code = class_code LIMIT 1 ) as name
         FROM dt_object
         FROM dt_object
         WHERE valid=TRUE
         WHERE valid=TRUE
+            <if test="null!=param.objTypes and param.objTypes.size()>0">
+                <foreach collection="param.objTypes" item="objType" open="AND obj_type IN(" close=")" separator=",">
+                    #{objType}
+                </foreach>
+            </if>
             <if test="null!=param.objType and param.objType.length>0">
             <if test="null!=param.objType and param.objType.length>0">
                 AND obj_type=#{param.objType}
                 AND obj_type=#{param.objType}
             </if>
             </if>