Przeglądaj źródła

Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

# Conflicts:
#	src/main/resources/mapper/HelpActivityMapper.xml
傅行帆 5 lat temu
rodzic
commit
7b8c2c5adf

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Wyświetl plik

@@ -400,8 +400,8 @@ public class TaBuildingDynamicController extends BaseController {
400 400
         dynamic.setOrgId(getOrgId(request));
401 401
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
402 402
         dynamic.setCityId(cityId);
403
-        //发布状态
404
-        dynamic.setStatus(0);
403
+        //发布状态 1展示
404
+        dynamic.setStatus(1);
405 405
         //活动状态,如果不需要报名则直接置为进行中
406 406
         dynamic.setActivityStatus(1);
407 407
         if (dynamic.getIsEnlist() == 0){

+ 0
- 55
src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java Wyświetl plik

@@ -60,66 +60,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
60 60
         // 最近七天
61 61
         Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
62 62
 
63
-        // 用户行为
64
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null, null, null, null, null);
65
-
66
-        // 用户活跃数
67
-        List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
68
-
69
-        // 新增用户数
70
-        List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
71
-
72
-        // 性别比例
73
-        // 1 男 2 女
74
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_MALE);
75
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_FEMALE);
76
-        Map<String, Object> selectSexMaleMap = new HashMap<>();
77
-        selectSexMaleMap.put("name", "男");
78
-        selectSexMaleMap.put("value", selectSexMale);
79
-        Map<String, Object> selectSexFemaleMap = new HashMap<>();
80
-        selectSexFemaleMap.put("name", "女");
81
-        selectSexFemaleMap.put("value", selectSexFemale);
82
-        List<Map<String, Object>> selectSexUser = new ArrayList<>();
83
-        selectSexUser.add(selectSexMaleMap);
84
-        selectSexUser.add(selectSexFemaleMap);
85
-
86
-        // 城市比例
87
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId);
88
-
89
-        // 转化率, 当前 默认项目收藏
90
-        Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical(orgId, "save");
91
-
92
-        // -------  用户来源 start ------------
93
-
94
-        // 用户来源 柱状
95
-        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
96
-
97
-        // 用户来源 饼状
98
-        // 来源置业顾问, 来源全民经纪人,自由进入
99
-        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
100
-        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
101
-        Integer person_null = taPersonMapper.selectUserSourcePie(orgId, null, CommConstant.PERSON_REALTY_CONSULTANT);
102
-        Map<String, Object> pieMap = new HashMap<>();
103
-        pieMap.put("person_realty_consultant", person_realty_consultant);
104
-        pieMap.put("person_estate_agent", person_estate_agent);
105
-        pieMap.put("person_null", person_null);
106
-
107
-        Map<String, Object> result = new HashMap<>();
108
-        result.put("columnar", mapList);
109
-        result.put("pie", pieMap);
110
-
111 63
         // -------  用户来源 end ------------
112 64
 
113 65
         map.put("selectUserCount", selectUserCount);
114 66
         map.put("selectRegisteredCount", selectRegisteredCount);
115 67
         map.put("selectRecentlyCount", selectRecentlyCount);
116
-        map.put("selectUserBehavior", selectUserBehavior);
117
-        map.put("selectActiveUserCount", selectActiveUserCount);
118
-        map.put("selectNewsUserCount", selectNewsUserCount);
119
-        map.put("selectSexUser", selectSexUser);
120
-        map.put("selectCityUser", selectCityUser);
121
-        map.put("selectBuildingStatistical", selectBuildingStatistical);
122
-        map.put("selectUserSource", result);
123 68
 
124 69
         responseBean.addSuccess(map);
125 70
 

+ 2
- 2
src/main/resources/mapper/HelpActivityMapper.xml Wyświetl plik

@@ -69,7 +69,7 @@
69 69
 				ta_help_activity a
70 70
 				WHERE
71 71
                     a.org_id =#{orgId}
72
-                <if test="buildingId  == null or buildingId == ''">
72
+                <if test="buildingId  == null or  buildingId ==''">
73 73
                   and  a.is_main = 1
74 74
                 </if>
75 75
                 <if test="cityID != null and cityID != ''">
@@ -90,7 +90,7 @@
90 90
 					ta_share_activity s
91 91
 					WHERE
92 92
                     s.org_id =#{orgId}
93
-                <if test="buildingId  == null or buildingId == ''">
93
+                <if test="buildingId  == null or  buildingId =='' ">
94 94
                     and  s.sort = 1
95 95
                 </if>
96 96
                 <if test="cityID != null and cityID != ''">