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

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

@@ -5,20 +5,14 @@ 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.center.taUser.entity.TaUser;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.service.impl.HelpActivityServiceImpl;
-import io.jsonwebtoken.lang.Collections;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +20,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -104,7 +97,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
-            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
@@ -192,6 +185,7 @@ public class ExtendContentController extends BaseController {
         if (StringUtils.isEmpty(extendContent.getContentType())){
             extendContent.setContentType("nothing");
         }
+        extendContent.setCreateUser(getUserId(request));
         responseBean = iExtendContentService.extendContentAdd(extendContent);
         responseBean.addSuccess(extendContent);
         return responseBean;

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

@@ -5,11 +5,13 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdWxDict;
 import com.huiju.estateagents.excel.IntentionUser;
 import com.huiju.estateagents.excel.StatsBuilding;
 import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.service.IStatisticalService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,7 +23,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计
@@ -326,4 +330,73 @@ public class StatisticalController extends BaseController {
         excelWriter.finish();
     }
 
+
+
+    /**
+     * 新增用户导出
+     * @return
+     */
+    @GetMapping(value = "/admin/exportUserStats")
+    public void exportUserStats(@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 = "userType", required = false) String userType,
+                                         HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=新增用户.xlsx");
+        ResponseBean responseBean = iStatisticalService.selectPersonFrom(getOrgId(request), startDate, endDate);
+        List<List<String>> headerList = headerList(responseBean.getData());
+        List<List<String>> dataList = dataList(responseBean.getData(),userType);
+        EasyExcel.write(response.getOutputStream()).head(headerList).sheet("新增用户").doWrite(dataList);
+    }
+
+    /**
+     * 构建表数据
+     * @param data
+     * @return
+     */
+    private List<List<String>> dataList(Object data,String userType) {
+        Map<String, Object> map = (Map<String, Object>) data;
+        List<TsPersonFromStatistic> list = (List<TsPersonFromStatistic>) map.get("list");
+        List<List<String>> dataList = new ArrayList<>();
+        List<TdWxDict> tdWxDicts = (List<TdWxDict>) map.get("tdWxDicts");
+        list.forEach(l -> {
+            List<String> columlist = new ArrayList<>();
+            columlist.add(l.getCreateTime());
+            tdWxDicts.forEach(e -> {
+                if (e.getSceneType().equals(l.getSceneType())){
+                    if (userType.equals("registered")){
+                        columlist.add(l.getRegisteredNum().toString());
+                    }else {
+                        columlist.add(l.getFromNum().toString());
+                    }
+                }else {
+                    columlist.add("0");
+                }
+            });
+            dataList.add(columlist);
+        });
+        return dataList;
+    }
+
+    /**
+     * 构造表头
+     * @param data
+     * @return
+     */
+    private List<List<String>> headerList(Object data) {
+        Map<String, Object> map = (Map<String, Object>) data;
+        List<TdWxDict> tdWxDicts = (List<TdWxDict>) map.get("tdWxDicts");
+        List<List<String>> headerList = new ArrayList<>();
+        List<String> rqHeader = new ArrayList<>();
+        rqHeader.add("日期");
+        headerList.add(rqHeader);
+        tdWxDicts.forEach(e -> {
+            List<String> header = new ArrayList<>();
+            header.add(e.getSceneAlias());
+            headerList.add(header);
+        });
+        return headerList;
+    }
+
 }

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -9,35 +9,26 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
-import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.json.YamlJsonParser;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.DateFormat;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 
 /**
@@ -89,6 +80,7 @@ public class TaDrainageController extends BaseController {
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
             //使用分页插件
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
@@ -100,6 +92,7 @@ public class TaDrainageController extends BaseController {
             queryWrapper.eq(null != status,"status",status);
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
             queryWrapper.orderByDesc("create_date");
 
@@ -141,6 +134,7 @@ public class TaDrainageController extends BaseController {
             if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())){
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
             }
+            taDrainage.setCreateUser(getUserId(request));
             if (iTaDrainageService.save(taDrainage)){
                 // 根据ORGID查询当前小程序表的miniapp_id
                 QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -61,6 +61,11 @@ public class TaDrainage implements Serializable {
      */
     private Integer enlistNum;
 
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
     /** 是否投放小程序 */
     private Boolean isMiniapp ;
     /** H5活动链接 */
@@ -80,4 +85,5 @@ public class TaDrainage implements Serializable {
     
     @TableField(exist = false)
     private String appSecret;
+
 }

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

@@ -1,13 +1,13 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 辅助内容表 
@@ -99,6 +99,11 @@ public class ExtendContent implements Serializable {
 
     private Integer cityId;
 
+    /**
+     * 创建人id
+     */
+    private Integer createUser;
+
     /**
      * 排序
      */

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

@@ -65,6 +65,7 @@
         GROUP BY
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
         tp.scene_type
+        ORDER BY tp.create_date
     </select>
     <select id="selectNewLinePersonFromGroupByData"
             resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">