bug fix

src/main/java/com/huiju/estateagents/controller/TsConsultantKpiController.java

@@ -69,6 +69,7 @@ public class TsConsultantKpiController extends BaseController {
                                              @RequestParam(value = "buildingId", required = false) String buildingId,
                                              @RequestParam(value = "asc", required = false) String asc,
                                              @RequestParam(value = "desc", required = false) String desc,
+                                             @RequestParam(value = "org", required = false) String org,
                                              HttpServletRequest request) {
         if (null == startDate || "".equals(startDate)) {
             return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -77,7 +78,7 @@ public class TsConsultantKpiController extends BaseController {
             endDate = DateUtils.today();
         }
 
-        Integer orgId = getOrgId(request);
+        Integer orgId = StringUtils.isEmpty(org) ? getOrgId(request) : Integer.valueOf(org);
         Integer userId = getUserId(request);
         try {
             // 汇总明细

src/main/java/com/huiju/estateagents/statistic/controller/TsUserBehaviorStatisticController.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
 import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -154,7 +156,9 @@ public class TsUserBehaviorStatisticController extends BaseController {
                                            @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
                                            @RequestParam(value = "buildingId", required = false) String buildingId,
+                                           @RequestParam(value = "org", required = false) String org,
                                            HttpServletRequest request) {
-        return iTsUserBehaviorStatisticService.selectUserBehavior(getOrgId(request), startDate, endDate, buildingId);
+        Integer orgId = StringUtils.isEmpty(org) ? getOrgId(request) : Integer.valueOf(org);
+        return iTsUserBehaviorStatisticService.selectUserBehavior(orgId, startDate, endDate, buildingId);
     }
 }

src/main/resources/mapper/TaBuildingMapper.xml

@@ -520,12 +520,12 @@
         SELECT
         b.*
         FROM
-        ta_person b
+        ta_recommend_customer b
         WHERE
         b.STATUS > 0
         AND b.org_id = #{orgId}
-        AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
-        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 != '' )
+        AND b.verify_status = 1
+        AND ( b.realty_consultant IS NULL OR b.realty_consultant = '' )
         <if test="startDate != null">
             and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
         </if>