yansen 4 年 前
コミット
2a14517205

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TsConsultantKpiController.java ファイルの表示

69
                                              @RequestParam(value = "buildingId", required = false) String buildingId,
69
                                              @RequestParam(value = "buildingId", required = false) String buildingId,
70
                                              @RequestParam(value = "asc", required = false) String asc,
70
                                              @RequestParam(value = "asc", required = false) String asc,
71
                                              @RequestParam(value = "desc", required = false) String desc,
71
                                              @RequestParam(value = "desc", required = false) String desc,
72
+                                             @RequestParam(value = "org", required = false) String org,
72
                                              HttpServletRequest request) {
73
                                              HttpServletRequest request) {
73
         if (null == startDate || "".equals(startDate)) {
74
         if (null == startDate || "".equals(startDate)) {
74
             return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
75
             return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
77
             endDate = DateUtils.today();
78
             endDate = DateUtils.today();
78
         }
79
         }
79
 
80
 
80
-        Integer orgId = getOrgId(request);
81
+        Integer orgId = StringUtils.isEmpty(org) ? getOrgId(request) : Integer.valueOf(org);
81
         Integer userId = getUserId(request);
82
         Integer userId = getUserId(request);
82
         try {
83
         try {
83
             // 汇总明细
84
             // 汇总明细

+ 5
- 1
src/main/java/com/huiju/estateagents/statistic/controller/TsUserBehaviorStatisticController.java ファイルの表示

5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.StringUtils;
8
 import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
9
 import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
9
 import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
10
 import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
11
+import io.swagger.models.auth.In;
10
 import org.slf4j.Logger;
12
 import org.slf4j.Logger;
11
 import org.slf4j.LoggerFactory;
13
 import org.slf4j.LoggerFactory;
12
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.beans.factory.annotation.Autowired;
154
                                            @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
156
                                            @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
155
                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
157
                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
156
                                            @RequestParam(value = "buildingId", required = false) String buildingId,
158
                                            @RequestParam(value = "buildingId", required = false) String buildingId,
159
+                                           @RequestParam(value = "org", required = false) String org,
157
                                            HttpServletRequest request) {
160
                                            HttpServletRequest request) {
158
-        return iTsUserBehaviorStatisticService.selectUserBehavior(getOrgId(request), startDate, endDate, buildingId);
161
+        Integer orgId = StringUtils.isEmpty(org) ? getOrgId(request) : Integer.valueOf(org);
162
+        return iTsUserBehaviorStatisticService.selectUserBehavior(orgId, startDate, endDate, buildingId);
159
     }
163
     }
160
 }
164
 }

+ 3
- 3
src/main/resources/mapper/TaBuildingMapper.xml ファイルの表示

520
         SELECT
520
         SELECT
521
         b.*
521
         b.*
522
         FROM
522
         FROM
523
-        ta_person b
523
+        ta_recommend_customer b
524
         WHERE
524
         WHERE
525
         b.STATUS > 0
525
         b.STATUS > 0
526
         AND b.org_id = #{orgId}
526
         AND b.org_id = #{orgId}
527
-        AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
528
-        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
527
+        AND b.verify_status = 1
528
+        AND ( b.realty_consultant IS NULL OR b.realty_consultant = '' )
529
         <if test="startDate != null">
529
         <if test="startDate != null">
530
             and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
530
             and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
531
         </if>
531
         </if>