lyhzzz 1 ماه پیش
والد
کامیت
ef9ff658be

+ 1 - 0
src/main/java/com/fdkankan/agent/response/UserIncrementVo.java

@@ -8,4 +8,5 @@ public class UserIncrementVo extends UserIncrement {
     private String userName;
     private String incrementTypeName;
     private Integer validTimeType;
+    private String cameraSn;
 }

+ 2 - 1
src/main/resources/mapper/agent/UserIncrementMapper.xml

@@ -3,9 +3,10 @@
 <mapper namespace="com.fdkankan.agent.mapper.IUserIncrementMapper">
 
     <select id="pageList" resultType="com.fdkankan.agent.response.UserIncrementVo" parameterType="com.fdkankan.agent.request.IncrementParam">
-        select  ui.*,u.user_name,it.name as incrementTypeName,it.valid_time_type from t_user_increment ui
+        select  ui.*,u.user_name,it.name as incrementTypeName,it.valid_time_type,a.sn_code as cameraSn from t_user_increment ui
         left join  t_user u on ui.user_id = u.id
         left join  t_increment_type it on ui.increment_type_id = it.id
+        left join t_camera a on ui.camera_id = a.id
         where ui.rec_status = 'A' and ui.agent_id = #{param.agentId}
         <if test="param.userName != null and param.userName != ''">
             and u.user_name like concat ('%',#{param.userName},'%')