Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

@@ -61,12 +61,12 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectUserBehavior")
-    public ResponseBean selectUserBehavior(@RequestParam(required = false) Integer pageNum,
-                                           @RequestParam(required = false) Integer pageCode,
+    public ResponseBean selectUserBehavior(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                            @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) {
-        return iStatisticalService.selectUserBehavior(pageNum, pageCode, startDate, endDate, buildingId);
+        return iStatisticalService.selectUserBehavior(pageNum, pageSize, startDate, endDate, buildingId);
     }
 
     /**
@@ -86,9 +86,8 @@ public class StatisticalController {
      */
     @GetMapping(value = "/admin/selectUserResource")
     public ResponseBean selectUserResource(@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 = "registeredType", required = false) String registeredType) {
-        return iStatisticalService.selectUserResource(startDate, endDate, registeredType);
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate) {
+        return iStatisticalService.selectUserResource(startDate, endDate);
     }
 
 
@@ -138,5 +137,15 @@ public class StatisticalController {
         return iStatisticalService.selectCityUser();
     }
 
+    /**
+     * 意向用户  首页
+     * @return
+     */
+    @GetMapping(value = "/admin/selectIntentionUser")
+    public ResponseBean selectIntentionUser(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
+                                            @RequestParam(value = "buildingId", required = false) String buildingId) {
+        return iStatisticalService.selectIntentionUser(pageNum, pageSize, buildingId);
+    }
 
 }

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

@@ -14,6 +14,7 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +57,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private ITaSaveService taSaveService;
 
+    @Autowired
+    private ITaBuildingService iTaBuildingService;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -192,6 +196,8 @@ public class TaBuildingDynamicController extends BaseController {
     public  ResponseBean buildingDynamicAdd(@RequestBody String parameter){
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
+        Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
+        dynamic.setCityId(cityId);
         dynamic.setStatus(1);
 //        dynamic.setDynamicId(idGen.nextId()+"");
         dynamic.setPublishDate(LocalDateTime.now());
@@ -205,11 +211,28 @@ public class TaBuildingDynamicController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaBuildingDynamic dynamic = JSONObject.parseObject(parameter, TaBuildingDynamic.class);
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
+        dynamic.setCityId(cityId);
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;
     }
 
+    @RequestMapping(value = "/admin/buildingDynamic/weight" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicWeight(@RequestParam String dynamicId,@RequestParam Integer weight){
+        ResponseBean responseBean = new ResponseBean();
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getById(dynamicId);
+        dynamic.setWeight(weight);
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id",dynamic);
+        if (iBuildingDynamicService.updateById(dynamic)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("失败");
+        }
+        return responseBean;
+    }
+
     @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
     public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
         ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
@@ -290,5 +313,6 @@ public class TaBuildingDynamicController extends BaseController {
         responseBean.addSuccess("成功");
         return responseBean;
     }
-    }
+
+}
 

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
@@ -50,6 +51,9 @@ public class TaNewsController extends BaseController {
     @Autowired
     public ITaSaveService iTaSaveService;
 
+    @Autowired
+    public ITaBuildingService iTaBuildingService;
+
 
     /**
      * 分页查询列表
@@ -104,6 +108,8 @@ public class TaNewsController extends BaseController {
      */
     @RequestMapping(value="/admin/taNews",method= RequestMethod.POST)
     public ResponseBean taNewsAdd(@RequestBody TaNews taNews){
+        Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
+        taNews.setCityId(cityId);
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }
@@ -129,6 +135,8 @@ public class TaNewsController extends BaseController {
     public ResponseBean taNewsUpdate(@PathVariable Integer id,
                                         @RequestBody TaNews taNews){
         taNews.setNewsId(id);
+        Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
+        taNews.setCityId(cityId);
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java

@@ -169,4 +169,6 @@ public class TaBuildingDynamic implements Serializable {
      * 活动报名人数
      */
     private Integer enlistNum;
+
+    private Integer weight;
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonIntentionRecordMapper.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +23,11 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
 
     IPage<TaPersonIntentionRecord> selectAll(IPage<TaPersonIntentionRecord> page);
 
+    /**
+     * 意向用户， 首页统计的 意向用户
+     * @param page
+     * @param buildingId
+     * @return
+     */
+    IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page, @Param("buildingId") String buildingId);
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -145,7 +145,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     /**
      * 用户来源 数据列表
      */
-    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate, @Param("registeredType") String registeredType);
+    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     // ------------- 用户来源 end ------------
 

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -90,6 +90,12 @@ public interface IStatisticalService {
      * 用户来源 首页
      * @return
      */
-    ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate, String registeredType);
+    ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate);
 
+    /**
+     * 意向用户 首页
+     * @param buildingId
+     * @return
+     */
+    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, String buildingId);
 }

src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java

@@ -41,6 +41,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Autowired
     private TaNewsMapper taNewsMapper;
 
+    @Autowired
+    private TaPersonIntentionRecordMapper taPersonIntentionRecordMapper;
 
 
     @Override
@@ -242,7 +244,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
 
     @Override
-    public ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate, String registeredType) {
+    public ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
         // 用户来源 柱状
         List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
@@ -258,7 +260,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         map.put("person_null", person_null);
 
         // 用户来源 数据列表
-        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate, registeredType);
+        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
 
         Map<String, Object> result = new HashMap<>();
         result.put("columnar", mapList);
@@ -338,4 +340,15 @@ public class StatisticalServiceImpl implements IStatisticalService {
         responseBean.addSuccess(map);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        IPage<Map<String,Object>> pg = new Page<>(pageNum, pageSize);
+        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, buildingId);
+
+        responseBean.addSuccess(page);
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -107,7 +107,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
-        buildingDynamicQueryWrapper.orderByDesc("create_date");
+        buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间)，2:未开始（展示活动报名时间）,3:结束（不展示）

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -13,4 +13,22 @@
             GROUP BY tpir.person_id
     </select>
 
+
+    <select id="selectIntentionUser" resultType="map">
+        SELECT
+            tpir.person_name as  personName,
+            tp.phone as phone,
+            GROUP_CONCAT(tpir.building_name) as buildingName,
+            SUM(tpir.intention) as intention
+        FROM
+            ta_person_intention_record tpir
+            LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+            <where>
+                <if test="buildingId != null and buildingId != ''">
+                    tpir.building_id = #{buildingId}
+                </if>
+            </where>
+        GROUP BY
+            tpir.person_id
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -246,64 +246,72 @@ FROM
         SELECT
         authorization_count_table.date as date,
         ifnull(authorization_count_table.authorization_count, 0) as authorization_count,
-        user_count_table.user_count as user_count
+        ifnull(user_count_table.user_count, 0) as user_count
         FROM
         (
             SELECT
-              *
+            *
             FROM
             (
-                SELECT
-                DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
-                FROM
-                sequence a
-                WHERE
+            SELECT
+              DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+            FROM
+              sequence a
+            WHERE
+
                 <if test="startDate == null or endDate == null">
                     a.rownum <![CDATA[ <= ]]> 7
                 </if>
                 <if test="startDate != null or endDate != null">
                     a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
                 </if>
+
             ) AS temp_date
             LEFT JOIN (
                 SELECT
-                COUNT(1) as authorization_count,
-                tpvr.visit_time AS visit_time
+                  COUNT(1) as authorization_count,
+                tp.create_date AS create_date
                 FROM
-                ta_person tp
-                INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+                  ta_person tp
                 where ifnull(tp.person_type, '') != #{personType}
-                and tp.phone is NOT NULL
-            ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
+                  and tp.phone is NOT NULL
+                GROUP BY tp.create_date
+                ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date , '%Y-%m-%d' )
+
         ) as authorization_count_table
         ,
-        (SELECT
-        *
-        FROM
         (
+          SELECT
+            *
+            FROM
+            (
             SELECT
-            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+             DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
             FROM
-            sequence a
+              sequence a
             WHERE
-            <if test="startDate == null or endDate == null">
-                a.rownum <![CDATA[ <= ]]> 7
-            </if>
-            <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-            </if>
+
+                <if test="startDate == null or endDate == null">
+                    a.rownum <![CDATA[ <= ]]> 7
+                </if>
+                <if test="startDate != null or endDate != null">
+                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                </if>
+
         ) AS temp_date
         LEFT JOIN (
             SELECT
-            COUNT(1) as user_count,
-            tpvr.visit_time AS visit_time
+              COUNT(1) as user_count,
+            tp.create_date AS create_date
             FROM
-            ta_person tp
-            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+                ta_person tp
             where ifnull(tp.person_type, '') != #{personType}
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
+            GROUP BY tp.create_date
+            ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date , '%Y-%m-%d' )
 
         ) as user_count_table
+        where
+          user_count_table.date = authorization_count_table.date
         GROUP BY date
     </select>
 
@@ -358,29 +366,32 @@ FROM
     </select>
 
     <select id="selectUserSourceData" resultType="map">
+
         select
             temp_date.date AS date,
             temp_date.from_name as from_name,
             temp_date.from_code as from_code,
             IFNULL(user_count.count, 0) as count,
+            IFNULL(registered_count.count,0) as registered,
             user_count.create_date as create_date
         FROM
         (
             SELECT
-                DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
-                tempf.from_name as from_name,
-                tempf.from_code as from_code
+            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+            tempf.from_name as from_name,
+            tempf.from_code as from_code
             FROM
-                sequence a
-                ,
-                td_person_from tempf
+            sequence a
+            ,
+            td_person_from tempf
             WHERE
-            <if test="startDate == null or endDate == null">
-                a.rownum <![CDATA[ <= ]]> 7
-            </if>
-            <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
-            </if>
+
+                <if test="startDate == null or endDate == null">
+                    a.rownum <![CDATA[ <= ]]> 7
+                </if>
+                <if test="startDate != null or endDate != null">
+                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                </if>
 
         ) AS temp_date
 
@@ -395,13 +406,28 @@ FROM
             LEFT JOIN td_person_from tpfs
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
-            and ifnull(tps.person_type, '') != #{personType}
-            <if test="registeredType == 'registered' and registeredType != ''">
-                and tps.phone is not null
-            </if>
+            and ifnull(tps.person_type, '') != 'Realty Consultant'
+
             GROUP BY tpfs.from_code
         ) as user_count
         ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = user_count.from_code
+        LEFT JOIN
+        (
+            SELECT
+                ifnull(COUNT(1), 0) as count,
+                tps.create_date as create_date,
+                tpfs.from_code as from_code,
+                tpfs.from_name as from_name
+            FROM ta_person tps
+            LEFT JOIN td_person_from tpfs
+            ON tps.from_code = tpfs.from_code
+            WHERE tpfs.from_code = tps.from_code
+                and ifnull(tps.person_type, '') != 'Realty Consultant'
+                and tps.phone is not null
+            GROUP BY tpfs.from_code
+        ) as registered_count
+        ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = registered_count.from_code
+        order by temp_date.date DESC
     </select>
 
 </mapper>