1

README.md

@@ -21,7 +21,7 @@
 1.添加经销商管理
     agentNew ,agentNewLog
 2.设备列表 /service/manage/camera/list
-    添加参数   agentId
+    添加参数   agentName 模糊查询
     添加返回值 agentName
 3.相机出库 /service/manage/camera/out
     添加参数 agentId

src/main/java/com/fdkankan/manage/vo/request/CameraParam.java

@@ -21,7 +21,7 @@ public class CameraParam extends RequestBase {
     private String activatedStartTime;          //激活时间
     private String activatedEndTime;            //激活时间
 
-    private Integer agentId;
+    private String  agentName;
 
 
 

src/main/resources/mapper/manage/CameraMapper.xml

@@ -38,8 +38,8 @@
         <if test="param.activatedEndTime !=null and param.activatedEndTime != '' ">
             and c.activated_time &lt;= #{param.activatedEndTime}
         </if>
-        <if test="param.agentId !=null  ">
-            and d.agent_id = #{param.agentId}
+        <if test="param.agentName !=null and param.agentName !=''  ">
+            and an.name like  concat('%',#{param.agentName},'%')
         </if>
         order by c.activated_time desc
     </select>

src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -5,10 +5,9 @@
     <select id="getCountGroupByUserId" resultType="com.fdkankan.manage.vo.response.GroupByCount" >
         SELECT user_id as id, count(id) as count FROM t_scene_plus p
         <if test="isObj != null and isObj = 1">
-            left join t_scene_plus_ext e
+            left join t_scene_plus_ext e on p.id = e.plus_id
         </if>
         WHERE  p.rec_status = 'A'
-
         and  p.user_id in
         <foreach item="userId" collection="userIdList" open="(" separator="," close=")">
             #{userId}