新需求

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

@@ -252,7 +252,7 @@ public class ExtendContentController extends BaseController {
             //一个城市只能有一个开屏广告
             boolean existFlag = iExtendContentService.advertistExistFlag(extendContent, getOrgId(request));
             if (!existFlag){
-                responseBean.addError("该城市已有开屏广告，请勿再次上架");
+                responseBean.addError("该发布位置已有开屏广告，请勿再次上架");
                 return responseBean;
             }
 

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

@@ -783,4 +783,9 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping("/wx/userInfo/updatePhoto")
+    public ResponseBean updateUserPhoto(String photoUrl, HttpServletRequest request){
+        String openId = getOpenId(request);
+        return taPersonService.updateUserPhoto(photoUrl, openId);
+    }
 }

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

@@ -351,4 +351,7 @@ public class TaBuilding implements Serializable {
 
     @TableField(exist = false)
     private List<TaSalesBatch> salesBatch;
+
+    @TableField(exist = false)
+    private List<ExtendContent> extendContent;
 }

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

@@ -120,4 +120,6 @@ public interface ITaPersonService extends IService<TaPerson> {
                    String targetId,
                    String targetName,
                    String promoter) throws Exception;
+
+    ResponseBean updateUserPhoto(String photoUrl, String openId);
 }

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

@@ -123,6 +123,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaRaiseInviteService iTaRaiseInviteService;
 
+    @Autowired
+    private IExtendContentService iExtendContentService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -227,7 +230,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id, TaPerson person, Integer orgId) {
+    public ResponseBean      buildingAllSelectId(String id, TaPerson person, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
@@ -343,6 +346,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getStatus, CommConstant.STATUS_NORMAL);
         List<TaSalesBatch> taSalesBatch = iTaSalesBatchService.list(salesBatchQueryWrapper);
 
+        // 查询关联项目的开屏广告
+        QueryWrapper<ExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
+        taExtendContentQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        taExtendContentQueryWrapper.eq("building_id", id);
+        taExtendContentQueryWrapper.eq("org_id", orgId);
+        taExtendContentQueryWrapper.eq("show_type", CommConstant.OPEN_SCREEN);
+        taExtendContentQueryWrapper.eq("show_position", CommConstant.BANNER_BUILDING);
+        List<ExtendContent> taExtendContents = iExtendContentService.list(taExtendContentQueryWrapper);
+        building.setExtendContent(taExtendContents);
+
+
         List<TaSalesBatch> resultSalesBatchList = new ArrayList<>();
         taSalesBatch.stream().forEach(record -> {
             // 查询批次下认筹是否开启邀请制

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.service.impl;
 
+import ch.qos.logback.core.pattern.util.RegularEscapeUtil;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -1255,4 +1256,22 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
 
+    @Override
+    public ResponseBean updateUserPhoto(String photoUrl, String openId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaPerson> taPersons = getPersonsByOpenId(openId);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+        TaUser taUser = new TaUser();
+        taUser.setUserId(taPerson.getUserId());
+        taUser.setPhoto(photoUrl);
+
+        taUserMapper.updateById(taUser);
+        responseBean.addSuccess("修改成功");
+        return responseBean;
+    }
 }

src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml

@@ -47,29 +47,38 @@
     </select>
     <select id="selectPersonFromGroupByData"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
+
         SELECT
-        sum( tp.from_num ) AS from_num,
-        sum( tp.registered_num ) AS registered_num,
-        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
-        tp.scene_type
-        FROM
-        ts_person_from_statistic tp
-        WHERE
-        tp.org_id = #{orgId}
+        DATE_FORMAT(
+        DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        FROM sequence
+        WHERE rownum &lt; DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
+
+        left join (SELECT sum( tp.from_num ) AS from_num, sum( tp.registered_num ) AS registered_num, DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time, tp.scene_type
+        FROM ts_person_from_statistic tp
+        WHERE tp.org_id = #{orgId}
         <if test="startDate != null or endDate != null">
             AND  DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN #{startDate} and #{endDate}
         </if>
         <if test="startDate == null or endDate == null">
             AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        GROUP BY
-        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
-        tp.scene_type
-        ORDER BY tp.create_date
+        GROUP BY DATE_FORMAT( tp.create_date, '%Y-%m-%d' ), tp.scene_type ORDER BY tp.create_date
+        ) as tp on date.date = tp.create_time
+
     </select>
     <select id="selectNewLinePersonFromGroupByData"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        select ifnull(tp.from_num, 0) as from_num , ifnull(tp.registered_num, 0) AS registered_num , ifnull(tp.create_time, date.date) AS create_time, ifnull(tp.scene_type, 'other') as scene_type from (
+
         SELECT
+        DATE_FORMAT(
+        DATE_ADD( STR_TO_DATE(#{startDate}, '%Y-%m-%d' ), INTERVAL rownum DAY ), '%Y-%m-%d' ) AS date
+        FROM sequence
+        WHERE rownum &lt; DATEDIFF(STR_TO_DATE( #{endDate}, '%Y-%m-%d' ), STR_TO_DATE( #{startDate}, '%Y-%m-%d' )) ) as date
+
+        left join (SELECT
         sum( tp.from_num ) AS from_num,
         sum( tp.registered_num ) AS registered_num,
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
@@ -89,5 +98,6 @@
         GROUP BY
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
         ORDER BY tp.create_date
+        ) as tp on date.date = tp.create_time
     </select>
 </mapper>