优化下 报表查询 数量

java110-bean/src/main/java/com/java110/dto/user/UserLoginDto.java

@@ -32,6 +32,10 @@ public class UserLoginDto extends PageDto implements Serializable {
 
     private String statusCd = "0";
 
+    private String storeId;
+    private String startTime;
+    private String endTime;
+
 
     public String getPassword() {
         return password;
@@ -121,4 +125,28 @@ public class UserLoginDto extends PageDto implements Serializable {
     public void setOrgName(String orgName) {
         this.orgName = orgName;
     }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

java110-db/src/main/resources/mapper/user/UserLoginServiceDaoImplMapper.xml

@@ -24,6 +24,9 @@
         left join u_org_staff_rel uosr on t.user_id = uosr.staff_id and uosr.status_cd = '0'
         left join u_org uo on uosr.org_id = uo.org_id  and uo.status_cd = '0'
         left join u_org puo on uo.parent_org_id = puo.org_id and puo.status_cd = '0'
+        <if test="storeId !=null and storeId != ''">
+            left join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
+        </if>
         where 1 =1
         <if test="parentOrgName !=null and parentOrgName != ''">
             and puo.org_name= #{parentOrgName}
@@ -40,6 +43,12 @@
         <if test="loginTime !=null and loginTime != ''">
             and t.login_time= #{loginTime}
         </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.login_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.login_time &lt;= #{endTime}
+        </if>
         <if test="source !=null and source != ''">
             and t.source= #{source}
         </if>
@@ -52,6 +61,9 @@
         <if test="token !=null and token != ''">
             and t.token= #{token}
         </if>
+        <if test="storeId !=null and storeId != ''">
+            and su.store_id= #{storeId}
+        </if>
         order by t.login_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -97,6 +109,9 @@
     <select id="queryUserLoginsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from u_user_login t
+        <if test="storeId !=null and storeId != ''">
+            left join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
+        </if>
         where 1 =1
         <if test="password !=null and password != ''">
             and t.password= #{password}
@@ -107,6 +122,12 @@
         <if test="loginTime !=null and loginTime != ''">
             and t.login_time= #{loginTime}
         </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.login_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.login_time &lt;= #{endTime}
+        </if>
         <if test="source !=null and source != ''">
             and t.source= #{source}
         </if>
@@ -119,6 +140,9 @@
         <if test="token !=null and token != ''">
             and t.token= #{token}
         </if>
+        <if test="storeId !=null and storeId != ''">
+            and su.store_id= #{storeId}
+        </if>
 
 
     </select>

service-user/src/main/java/com/java110/user/api/UserLoginApi.java

@@ -102,6 +102,9 @@ public class UserLoginApi {
     public ResponseEntity<String> queryUserLogin(@RequestParam(value = "userName", required = false) String userName,
                                                  @RequestParam(value = "parentOrgName", required = false) String parentOrgName,
                                                  @RequestParam(value = "orgName", required = false) String orgName,
+                                                 @RequestParam(value = "storeId", required = false) String storeId,
+                                                 @RequestParam(value = "startTime", required = false) String startTime,
+                                                 @RequestParam(value = "endTime", required = false) String endTime,
                                                  @RequestParam(value = "page") int page,
                                                  @RequestParam(value = "row") int row) {
         UserLoginDto userLoginDto = new UserLoginDto();
@@ -110,6 +113,9 @@ public class UserLoginApi {
         userLoginDto.setUserName(userName);
         userLoginDto.setParentOrgName(parentOrgName);
         userLoginDto.setOrgName(orgName);
+        userLoginDto.setStoreId(storeId);
+        userLoginDto.setStartTime(startTime);
+        userLoginDto.setEndTime(endTime);
         return getUserLoginBMOImpl.get(userLoginDto);
     }