lyhzzz 4 月之前
父节点
当前提交
a949d4dd69

+ 2 - 0
src/main/java/com/fdkankan/fusion/request/ScenePram.java

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.request;
 
 
 import com.fdkankan.fusion.common.RequestBase;
 import com.fdkankan.fusion.common.RequestBase;
 import lombok.Data;
 import lombok.Data;
+import scala.Int;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -15,6 +16,7 @@ public class ScenePram extends RequestBase {
     private Integer caseId;
     private Integer caseId;
 
 
     private List<String> snCodes;
     private List<String> snCodes;
+    private List<Int> sceneSource;
 
 
     private String deptId;
     private String deptId;
     private String snCode;
     private String snCode;

+ 0 - 19
src/main/resources/mapper/fusion/ScenePlusMapper.xml

@@ -75,25 +75,12 @@
         <if test="param.num != null and param.num !='' ">
         <if test="param.num != null and param.num !='' ">
             and s.num like concat ('%',#{param.num},'%')
             and s.num like concat ('%',#{param.num},'%')
         </if>
         </if>
-        <if test="param.userName != null and param.userName !='' ">
-            and u.user_name like concat ('%',#{param.userName},'%')
-        </if>
-        <if test="param.notUserId != null ">
-            and u.id != #{param.notUserId}
-        </if>
-
         <if test="param.sceneSource != null and param.sceneSource.size >0">
         <if test="param.sceneSource != null and param.sceneSource.size >0">
             and s.scene_source in
             and s.scene_source in
             <foreach item="source" collection="param.sceneSource" open="(" separator="," close=")">
             <foreach item="source" collection="param.sceneSource" open="(" separator="," close=")">
                 #{source}
                 #{source}
             </foreach>
             </foreach>
         </if>
         </if>
-        <if test="param.threeCamType !=null  ">
-            and s.three_cam_type = 'yzl'
-        </if>
-        <if test="param.notThreeCamType !=null ">
-            and s.three_cam_type is null
-        </if>
 
 
         <if test="param.userId!=null">
         <if test="param.userId!=null">
             and u.id  = #{param.userId}
             and u.id  = #{param.userId}
@@ -125,12 +112,6 @@
         <if test="param.num != null and param.num !='' ">
         <if test="param.num != null and param.num !='' ">
             and s.scene_code like concat ('%',#{param.num},'%')
             and s.scene_code like concat ('%',#{param.num},'%')
         </if>
         </if>
-        <if test="param.userName != null and param.userName !='' ">
-            and s.user_name like concat ('%',#{param.userName},'%')
-        </if>
-        <if test="param.notUserId != null ">
-            and u.id != #{param.notUserId}
-        </if>
 
 
         <if test="param.sceneSource != null and param.sceneSource.size >0">
         <if test="param.sceneSource != null and param.sceneSource.size >0">
             and s.scene_source in
             and s.scene_source in