feats

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,114 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL =
-            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: : " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}

.mvn/wrapper/maven-wrapper.properties

@@ -1 +0,0 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.46</version>
+	<version>1.0.59</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 
@@ -151,6 +151,11 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+		<dependency>
+			<groupId>com.github.whvcse</groupId>
+			<artifactId>easy-captcha</artifactId>
+			<version>1.6.2</version>
+		</dependency>
 
 		<dependency>
 			<groupId>fadada</groupId>

src/main/java/com/huiju/estateagents/EstateagentsApplication.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents;
 
-import com.huiju.estateagents.websocket.ChatServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -15,7 +14,6 @@ public class EstateagentsApplication {
 	public static void main(String[] args) {
 		SpringApplication springApplication = new SpringApplication(EstateagentsApplication.class);
 		ConfigurableApplicationContext configurableApplicationContext = springApplication.run(args);
-//		ChatServer.setApplicationContext(configurableApplicationContext);
 	}
 
 }

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -11,16 +11,17 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.*;
 import com.huiju.estateagents.center.taUser.service.*;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.huiju.estateagents.property.service.ITaUserCommunityService;
+import com.huiju.estateagents.property.service.ITpCommunityService;
 import com.huiju.estateagents.service.*;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 
 import java.text.SimpleDateFormat;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -85,6 +87,18 @@ public class TaUserController extends BaseController {
     @Autowired
     public ITpLifeConsultantEvaluateService iTpLifeConsultantEvaluateService;
 
+    @Autowired
+    public ITpCommunityService iTpCommunityService;
+
+    @Autowired
+    public ITaUserCommunityService iTaUserCommunityService;
+
+    @Autowired
+    public CaptchaUtils captchaUtils;
+
+    @Autowired
+    LoginLocker loginLocker;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -307,15 +321,20 @@ public class TaUserController extends BaseController {
             taUser.setOrgLogo(taOrg.getLogo());
             taUser.setOrgDesc(taOrg.getOrgDesc());
             taUser.setBossDisplay(taOrg.getBossDisplay());
+            //
+            taUser.setCommunityList(iTaUserCommunityService.getListBy(taUser.getOrgId(), taUser.getUserId()));
 
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
 
+            // 获取所有社区
+            List<TpCommunity> communityList = iTpCommunityService.getAllByOrg(taUser.getOrgId());
 
             userMap.put("taUser", taUser);
             userMap.put("menuList", allMenus);
             userMap.put("buttonList", allButtons);
+            userMap.put("communityList", communityList);
             responseBean.addSuccess(userMap);
         }catch (Exception e){
             e.printStackTrace();
@@ -339,16 +358,39 @@ public class TaUserController extends BaseController {
     
         String userName = params.getString("loginName");
         String userPassword = params.getString("loginPassword");
-    
+        String captcha = params.getString("captcha");
+        String captchaKey = params.getString("captchaKey");
+
+        // 试错 3 次被锁定
+        int maxTryTimes = 3;
+        if (null != userName) {
+            LoginLocker.LogInfo logInfo = loginLocker.get("admin-" + userName);
+            if (null != logInfo) {
+                if (logInfo.getTimes() >= maxTryTimes) {
+                    String errMsg = String.format("该账号被锁定, 请 %d 分钟后重试", Duration.between(LocalDateTime.now(), logInfo.getExpire()).toMinutes() + 1);
+                    return ResponseBean.error(errMsg, ResponseBean.ERROR_UNAVAILABLE);
+                }
+            }
+        }
+
+        if (!captchaUtils.valid(captchaKey, captcha)) {
+            return ResponseBean.error("验证码不正确或者已过期", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         //验证用户名密码是否正确
         QueryWrapper<TaUser> sysUserQueryWrapper = new QueryWrapper<>();
         sysUserQueryWrapper.eq("login_name",userName);
         sysUserQueryWrapper.eq("login_password", MD5Utils.md5(userPassword));
         TaUser taUser = iTaUserService.getOne(sysUserQueryWrapper);
         if (taUser == null) {
-            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            LoginLocker.LogInfo logInfo = loginLocker.add("admin-" + userName);
+            String errMsg = String.format("用户名或密码错误, 您还有 %d 次机会", maxTryTimes - logInfo.getTimes());
+            return ResponseBean.error(errMsg, ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        // 解除锁定
+        loginLocker.remove("admin-"+userName);
+
         QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
         taUserQueryWrapper.eq("org_id", taUser.getOrgId());
         taUserQueryWrapper.eq("is_admin", 1);
@@ -496,6 +538,9 @@ public class TaUserController extends BaseController {
                     taUser.setBuildingIds(buildings);
                 }
             }
+
+            taUser.setCommunityList(iTaUserCommunityService.getListBy(taUser.getOrgId(), taUser.getUserId()));
+
             responseBean.addSuccess(taUser);
         }catch (Exception e){
             e.printStackTrace();
@@ -582,34 +627,17 @@ public class TaUserController extends BaseController {
     public ResponseBean lifeConsultantList(@PathVariable String client,
                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value ="communityId") Integer communityId,
                                            @RequestParam(value ="userName", required = false) String userName,
                                            @RequestParam(value ="phone", required = false) String phone,
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String month = new SimpleDateFormat("yyyyMM").format(new Date());
         try {
             //使用分页插件
             IPage<TaUser> pg = new Page<TaUser>(pageNum, pageSize);
-            LambdaQueryWrapper<TaUser> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(TaUser::getOrgId,getOrgId(request));
-            queryWrapper.eq(TaUser::getType,"life-consultant");
-            queryWrapper.like(!StringUtils.isEmpty(userName), TaUser::getUserName,"%"+ userName + "%");
-            queryWrapper.like(!StringUtils.isEmpty(phone), TaUser::getPhone,"%"+ phone + "%");
-            queryWrapper.orderByDesc(TaUser::getCreateDate);
-            IPage<TaUser> result = iTaUserService.page(pg,queryWrapper);
-            List<TaUser> records = result.getRecords();
-            records.forEach(e -> {
-                LambdaQueryWrapper<TpLifeConsultantEvaluate> evaluateQueryWrapper = new LambdaQueryWrapper<>();
-                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getOrgId,getOrgId(request));
-                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getUserId,e.getUserId());
-                evaluateQueryWrapper.eq(TpLifeConsultantEvaluate::getEvaluateTime,new SimpleDateFormat("yyyyMM").format(new Date()));
-                List<TpLifeConsultantEvaluate> list = iTpLifeConsultantEvaluateService.list(evaluateQueryWrapper);
-                if (list.size() > 0){
-                    double asDouble = list.stream().mapToInt(TpLifeConsultantEvaluate::getScore).average().getAsDouble();
-                    // 平均分
-                    e.setAverageScore(asDouble);
+            IPage<TaUser> result = iTaUserService.getLifeConsultants(pg, getOrgId(request), communityId, month, userName, phone);
 
-                }
-            });
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.property.entity.TpCommunity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -289,4 +290,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private Double averageScore;
+
+    /**
+     * 授权的社区
+     */
+    @TableField(exist = false)
+    private List<TpCommunity> communityList;
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -37,4 +38,11 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     List<String> getBuildingIdsOf(@Param("userId") Integer userId,@Param("buildingId") String buildingId);
 
     TaUser getUserByPerson(@Param("orgId") Integer orgId, @Param("personId") String personId);
+
+    IPage<TaUser> getLifeConsultants(IPage<TaUser> pg,
+                                     @Param("orgId")  Integer orgId,
+                                     @Param("communityId")  Integer communityId,
+                                     @Param("month")  String month,
+                                     @Param("userName")  String userName,
+                                     @Param("phone") String phone);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -75,4 +75,6 @@ public interface ITaUserService extends IService<TaUser> {
      * @return
      */
     TaUser getUserInfoById(Integer userId, Integer orgId);
+
+    IPage<TaUser> getLifeConsultants(IPage<TaUser> pg, Integer orgId, Integer communityId, String month, String userName, String phone);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -22,6 +22,9 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.property.entity.TaUserCommunity;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.huiju.estateagents.property.service.ITaUserCommunityService;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,6 +101,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
     @Autowired
     private TaChannelProxyMapper taChannelProxyMapper;
 
+    @Autowired
+    private ITaUserCommunityService iTaUserCommunityService;
+
     @Autowired
     private WxUtils wxUtils;
 
@@ -495,6 +501,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             });
         }
 
+        // 保存授权小区
+        if (null == taUser.getCommunityList() || taUser.getCommunityList().size() < 1) {
+            throw new Exception("未授权小区");
+        }
+
+        iTaUserCommunityService.addUserCommunity(taUser.getOrgId(), taUser.getUserId(), taUser.getCommunityList());
+
         return taUser;
     }
 
@@ -588,6 +601,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             });
         }
 
+        // 保存授权小区
+        if (null == taUser.getCommunityList() || taUser.getCommunityList().size() < 1) {
+            throw new Exception("未授权小区");
+        }
+
+        iTaUserCommunityService.addUserCommunity(taUser.getOrgId(), taUser.getUserId(), taUser.getCommunityList());
+
         //更新person
         TaPerson taPerson = new TaPerson();
         taPerson.setAvatarurl(taUser.getAvatar());
@@ -697,6 +717,11 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         return getOne(userQueryWrapper);
     }
 
+    @Override
+    public IPage<TaUser> getLifeConsultants(IPage<TaUser> pg, Integer orgId, Integer communityId, String month, String userName, String phone) {
+        return taUserMapper.getLifeConsultants(pg, orgId, communityId, month, userName, phone);
+    }
+
     private boolean updateUserStatus(TaUser user) {
         UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("user_id", user.getUserId());

src/main/java/com/huiju/estateagents/common/CaptchaUtils.java

@@ -0,0 +1,91 @@
+package com.huiju.estateagents.common;
+
+import com.wf.captcha.SpecCaptcha;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Hashtable;
+import java.util.UUID;
+
+@Slf4j
+@Component
+@EnableScheduling
+public class CaptchaUtils {
+    Hashtable<String, Captcha> allCaptchas = new Hashtable<>();
+
+    public Captcha generate() {
+        SpecCaptcha specCaptcha = new SpecCaptcha(130, 48, 5);
+        Captcha cap = new Captcha()
+                .setKey(UUID.randomUUID().toString())
+                .setValue(specCaptcha.text().toLowerCase())
+                .setImage(specCaptcha.toBase64())
+                .setExpire(LocalDateTime.now().plusMinutes(15));
+        allCaptchas.put(cap.getKey(), cap);
+
+        // 返回的内容不包含 value
+        return copy(cap).setValue(null);
+    }
+
+    public boolean valid(String key, String captcha) {
+        if (null == captcha || null == key) {
+            return false;
+        }
+
+        // 没有对应键值
+        Captcha cap = allCaptchas.get(key);
+        if (null == cap) {
+            return false;
+        }
+
+        // 内容不匹配
+        if (!cap.getValue().equals(captcha.toLowerCase())) {
+            return false;
+        }
+
+        boolean res = checkExpire(cap);
+        if (res) {
+            // 过期清除
+            allCaptchas.remove(key);
+        }
+
+        return !res;
+    }
+
+    private Captcha copy(Captcha captcha) {
+        return new Captcha()
+                .setKey(captcha.getKey())
+                .setValue(captcha.getValue())
+                .setImage(captcha.getImage())
+                .setExpire(captcha.getExpire());
+    }
+
+    private boolean checkExpire(Captcha cap) {
+        return LocalDateTime.now().isAfter(cap.getExpire());
+    }
+
+    /**
+     * 定时任务 每半小时 清除一次不用的缓存
+     */
+    @Scheduled(fixedRate = 1000 * 60 * 30)
+    public void clearUnused() {
+        for (Captcha cap: allCaptchas.values()) {
+            if (checkExpire(cap)) {
+                allCaptchas.remove(cap.getKey());
+            }
+        }
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Captcha {
+        String key;
+        String value;
+        String image;
+        LocalDateTime expire;
+    }
+}

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -936,6 +936,7 @@ public class CommConstant {
     public static final String SMS_BIZ_REPAIRE_TICKET = "repaire-ticket";
 
     // 推送消息类型
-    public static final String TP_MESSAGE_BIRTHDAY = "birthday";
-    public static final String TP_MESSAGE_FESTIVAL= "festival";
+    public static final String TP_MESSAGE_BIRTHDAY = "birthday";    // 生日
+    public static final String TP_MESSAGE_FESTIVAL= "festival";     // 节日
+    public static final String TP_MESSAGE_TICKET= "ticket";         // 工单
 }

src/main/java/com/huiju/estateagents/common/DateUtils.java

@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Locale;
 
 public class DateUtils {
     public static LocalDateTime date2LocalDateTime(Date date) {
@@ -60,6 +61,15 @@ public class DateUtils {
         return false;
     }
 
+    public static String format(LocalDateTime dt, String formatStr) {
+        if (null == dt) {
+            return null;
+        }
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formatStr);
+        return dt.format(formatter);
+    }
+
     /**
      * 当前时间是否早于指定时间
      *
@@ -114,4 +124,13 @@ public class DateUtils {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         return LocalDateTime.parse(target, df);
     }
+
+    public static LocalDateTime parse(String str, String format) {
+        if (null == str || "".equals(str) || "null".equals(str) || "undefined".equals(str)) {
+            return null;
+        }
+
+        DateTimeFormatter df = DateTimeFormatter.ofPattern(format, Locale.CHINA);
+        return LocalDateTime.parse(str, df);
+    }
 }

src/main/java/com/huiju/estateagents/common/LoginLocker.java

@@ -0,0 +1,75 @@
+package com.huiju.estateagents.common;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Hashtable;
+
+@Slf4j
+@Component
+@EnableScheduling
+public class LoginLocker {
+    // 锁定时长 分钟
+    public static final int lockTime = 5;
+
+    Hashtable<String, LogInfo> allLogs = new Hashtable<>();
+
+    public LogInfo get(String name) {
+        return allLogs.get(name);
+    }
+
+    public LogInfo add(String name) {
+        if (null == name) {
+            return null;
+        }
+
+        LogInfo logInfo = allLogs.get(name);
+        if (null == logInfo) {
+            logInfo = new LogInfo()
+                    .setKey(name)
+                    .setTimes(1)
+                    .setExpire(LocalDateTime.now().plusMinutes(lockTime));
+            allLogs.put(name, logInfo);
+        } else {
+            logInfo.setTimes(logInfo.getTimes() + 1)
+                    .setExpire(LocalDateTime.now().plusMinutes(lockTime));
+        }
+
+        return logInfo;
+    }
+
+    public void remove(String name) {
+        try {
+            allLogs.remove(name);
+        } catch (Exception e) {}
+    }
+
+    private boolean checkExpire(LogInfo log) {
+        return LocalDateTime.now().isAfter(log.getExpire());
+    }
+
+    /**
+     * 定时任务 每分钟 清除一次不用的缓存
+     */
+    @Scheduled(fixedRate = 1000 * 60)
+    public void clearUnused() {
+        for (LogInfo log: allLogs.values()) {
+            if (checkExpire(log)) {
+                allLogs.remove(log.getKey());
+            }
+        }
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class LogInfo {
+        String key;
+        int times;
+        LocalDateTime expire;
+    }
+}

src/main/java/com/huiju/estateagents/common/StringUtils.java

@@ -145,4 +145,19 @@ public class StringUtils {
             return null;
         }
     }
+
+    /**
+     * 简易脱敏
+     * @param source
+     * @param regx
+     * @param repl
+     * @return
+     */
+    public static String simpleSensitive(String source, String regx, String repl) {
+        if (isEmpty(source)) {
+            return source;
+        }
+
+        return source.replaceAll(regx, repl);
+    }
 }

src/main/java/com/huiju/estateagents/common/smsService/Captcha.java

@@ -84,16 +84,16 @@ public class Captcha {
      * @return
      */
     public boolean validate(String tel, String captcha) {
-        Phone phone = fromCache(tel);
-        if (null == phone) {
-            return false;
-        }
-
         String universalCode = getUniversalCode();
         if (universalCode.equals(captcha)) {
             return true;
         }
 
+        Phone phone = fromCache(tel);
+        if (null == phone) {
+            return false;
+        }
+
         if (null == captcha || !captcha.equals(phone.getCaptcha())) {
             return false;
         }
@@ -101,7 +101,7 @@ public class Captcha {
         // 过期则清除缓存
         boolean res = checkExpire(phone);
         if (res) {
-            clearCache(phone);
+            clearCache(tel);
         }
 
         return !res;
@@ -137,7 +137,7 @@ public class Captcha {
     public void clearUnused() {
         for (Phone phone: allPhones.values()) {
             if (checkExpire(phone)) {
-                clearCache(phone);
+                clearCache(phone.getNumber());
             }
         }
     }
@@ -148,7 +148,7 @@ public class Captcha {
     private void toCache(Phone phone) {
         allPhones.put(phone.getNumber(), phone);
     }
-    private void clearCache(Phone phone) { allPhones.remove(phone); }
+    private void clearCache(String key) { allPhones.remove(key); }
 
     private LocalDateTime expireTime() {
         return LocalDateTime.now().plusSeconds(expireSec);

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

@@ -4,21 +4,18 @@ package com.huiju.estateagents.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.AliOSSUtils;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.SMSUtils;
-import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.common.smsService.Captcha;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -39,7 +36,10 @@ public class CommonController extends BaseController {
     IMiniAppService iMiniAppService;
 
     @Autowired
-    Captcha captchaServ;
+    Captcha captchaServ;    // 短信验证码
+
+    @Autowired
+    CaptchaUtils captchaUtils;  // 图片验证码
 
     /**
      * 图片
@@ -57,6 +57,12 @@ public class CommonController extends BaseController {
         }
     }
 
+    @ApiOperation("获取图片验证码")
+    @GetMapping("/admin/image-captcha")
+    public ResponseBean getCaptcha(HttpServletRequest request, HttpServletResponse response) {
+        return ResponseBean.success(captchaUtils.generate());
+    }
+
     @PostMapping("/admin/qrcode")
     public ResponseBean createQrCode(@RequestBody String jsonStr, HttpServletRequest request) {
         Integer orgId = getOrgId(request);

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

@@ -9,14 +9,13 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.SMSUtils;
-import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.*;
 import com.huiju.estateagents.common.smsService.Captcha;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaChannelPerson;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.TaPersonExport;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
@@ -28,6 +27,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -816,19 +817,52 @@ public class TaPersonController extends BaseController {
                                       @RequestParam(defaultValue = "10") int pageSize,
                                       @RequestParam(value = "name", required = false) String name,
                                       @RequestParam(value = "phone", required = false) String phone,
+                                      @RequestParam(value = "recommended", required = false) String recommended,
                                       HttpServletRequest request) {
         Integer orgId = getOrgId(request);
 
-        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("org_id", orgId);
-        queryWrapper.like(!StringUtils.isEmpty(name),"nickname", "%"+name+"%");
-        queryWrapper.eq(!StringUtils.isEmpty(phone),"phone", phone);
-        queryWrapper.isNotNull("avatarurl");
-        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
-
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
+        IPage<TaPerson> result = taPersonService.getPersonBy(page, orgId, name, phone, recommended);
+
+        return ResponseBean.success(result);
+    }
 
-        return ResponseBean.success(taPersonService.page(page, queryWrapper));
+    @GetMapping("/admin/person-list/export")
+    public ResponseBean getPersonListExport(@RequestParam(value = "name", required = false) String name,
+                                            @RequestParam(value = "phone", required = false) String phone,
+                                            @RequestParam(value = "recommended", required = false) String recommended,
+                                            HttpServletRequest request,
+                                            HttpServletResponse response) {
+        Integer orgId = getOrgId(request);
+
+        IPage<TaPerson> page = new Page<>(1, 9999);
+        IPage<TaPerson> result = taPersonService.getPersonBy(page, orgId, name, phone, recommended);
+
+        List<TaPerson> personList = result.getRecords();
+        List<TaPersonExport> data = new ArrayList<>();
+        if (null != personList) {
+//            String senRegx = "(\\\\d{3})\\\\d{4}(\\\\d{4})";
+//            String senRepl = "$1****$2";
+            for (TaPerson person: personList) {
+                TaPersonExport row = new TaPersonExport();
+                row.setNickname(person.getNickname());
+//                row.setPhone(StringUtils.simpleSensitive(person.getPhone(), senRegx, senRepl));
+                row.setPhone(person.getPhone());
+                row.setSharePersonName(person.getSharePersonName());
+                row.setPoints(person.getPoints());
+                row.setCreateDate(DateUtils.format(person.getCreateDate(), "yyyy-MM-dd HH:mm"));
+                data.add(row);
+            }
+        }
+
+        try {
+            ExcelUtils.flush(response, TaPersonExport.class, data, "会员列表");
+        } catch (IOException e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return null;
     }
 
 }

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

@@ -6,8 +6,11 @@ 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.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.ExcelUtils;
 import com.huiju.estateagents.entity.TaGoods;
 import com.huiju.estateagents.entity.TaPointsExchange;
+import com.huiju.estateagents.excel.TaPointsExchangeExport;
 import com.huiju.estateagents.service.ITaGoodsService;
 import com.huiju.estateagents.service.ITaPointsExchangeService;
 import io.swagger.annotations.Api;
@@ -26,7 +29,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -94,6 +99,69 @@ public class TaPointsExchangeController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taPointsExchange/export",method= RequestMethod.GET)
+    public ResponseBean taPointsExchangeExport(@RequestParam(value ="personName",required = false) String personName,
+                                               @RequestParam(value ="phone",required = false) String phone,
+                                               @RequestParam(value ="personType",required = false) String personType,
+                                               @RequestParam(value ="targetName",required = false) String targetName,
+                                               @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                               @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
+                                               @RequestParam(value ="startVerifyDate",required = false) String startVerifyDate,
+                                               @RequestParam(value ="endVerifyDate",required = false) String endVerifyDate,
+                                               @RequestParam(value ="status",required = false) Integer status,
+                                               @RequestParam(value ="tel",required = false) String tel,
+                                               HttpServletRequest request,
+                                               HttpServletResponse response){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            TaPointsExchange taPointsExchange = new TaPointsExchange();
+            taPointsExchange.setPersonName(personName);
+            taPointsExchange.setPhone(phone);
+            taPointsExchange.setPersonType(personType);
+            taPointsExchange.setTargetName(targetName);
+            taPointsExchange.setStartCreateDate(startCreateDate);
+            taPointsExchange.setEndCreateDate(endCreateDate);
+            taPointsExchange.setStartVerifyDate(startVerifyDate);
+            taPointsExchange.setEndVerifyDate(endVerifyDate);
+            taPointsExchange.setStatus(status);
+            taPointsExchange.setTel(tel);
+            taPointsExchange.setOrgId(getOrgId(request));
+
+            responseBean = iTaPointsExchangeService.selectList(1, 9999,taPointsExchange,getTaPersonBuildingListByUserId(request));
+            List<TaPointsExchange> records = ((Page<TaPointsExchange>) responseBean.getData()).getRecords();
+
+            List<TaPointsExchangeExport> list = new ArrayList<>();
+            if (null != records) {
+                for (TaPointsExchange item: records) {
+                    TaPointsExchangeExport row = new TaPointsExchangeExport();
+                    row.setPersonName(item.getPersonName());
+                    row.setPhone(item.getPhone());
+                    row.setPersonType("prop".equals(item.getPersonType()) ? "物业相关" : ("life-consultant".equals(item.getPersonType()) ? "生活管家" : null));
+                    row.setTargetName(item.getTargetName());
+                    row.setStatus(1 == item.getStatus() ? "已领取" : "未领取");
+                    row.setCreateDate(DateUtils.format(item.getCreateDate(), "yyyy-MM-dd HH:mm"));
+                    row.setVerifyDate(DateUtils.format(item.getVerifyDate(), "yyyy-MM-dd HH:mm"));
+                    list.add(row);
+                }
+            }
+
+            ExcelUtils.flush(response, TaPointsExchangeExport.class, list, "积分兑换记录" + DateUtils.today());
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsExchangeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
     
     /**
      * 修改对象
@@ -231,7 +299,13 @@ public class TaPointsExchangeController extends BaseController {
     public ResponseBean wxPointsExchangeList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "buildingId", required = false) String buildingId,
-                                             @RequestParam(value = "personId", required = false) String personId){
+                                             @RequestParam(value = "personId", required = false) String personId,
+                                             HttpServletRequest request){
+
+        if (null == personId) {
+            personId = getPersonId(request);
+        }
+
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件

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

@@ -144,6 +144,12 @@ public class TaPointsRecordsController extends BaseController {
                     case CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY:
                         result.getRecords().get(i).setRecordName("资料审核");
                         break;
+                    case CommConstant.POINTS_PAYMENT:
+                        result.getRecords().get(i).setRecordName("物业缴费");
+                        break;
+                    case CommConstant.POINTS_USER_VERIFY:
+                        result.getRecords().get(i).setRecordName("业主认证");
+                        break;
                 }
             }
             responseBean.addSuccess(result);

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

@@ -49,6 +49,8 @@ public class TpNewsController extends BaseController {
                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                  @RequestParam(value = "newsName", required = false) String newsName,
                                  @RequestParam(value = "newsTypeId", required = false) String newsTypeId,
+                                 @RequestParam(value ="startCreateDate",required = false) String startCreateDate,
+                                 @RequestParam(value ="endCreateDate",required = false) String endCreateDate,
                                  @PathVariable String client,
                                  HttpServletRequest request) {
         Integer orgId = getOrgId(request);
@@ -59,7 +61,7 @@ public class TpNewsController extends BaseController {
         }
 
         IPage<TpNews> page = new Page<>(pageNum, pageSize);
-        IPage<TpNews> result = iTpNewsService.getListBy(page, orgId, newsName, status,newsTypeId);
+        IPage<TpNews> result = iTpNewsService.getListBy(page, orgId, newsName, status,newsTypeId,startCreateDate,endCreateDate);
 
         return ResponseBean.success(result);
     }

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

@@ -108,7 +108,7 @@ public class TaPointsExchange implements Serializable {
     
     @TableField(exist = false)
     private String personType;
-    
+
     @TableField(exist = false)
     private String startCreateDate;
     

src/main/java/com/huiju/estateagents/excel/TaPersonExport.java

@@ -0,0 +1,29 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class TaPersonExport {
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickname;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    @ColumnWidth(20)
+    @ExcelProperty(value = "推荐人", index = 2)
+    private String sharePersonName;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "总积分", index = 3)
+    private Integer points;
+
+    @ColumnWidth(25)
+    @ExcelProperty(value = "创建时间", index = 4)
+    private String createDate;
+}

src/main/java/com/huiju/estateagents/excel/TaPointsExchangeExport.java

@@ -0,0 +1,57 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class TaPointsExchangeExport {
+
+    /**
+     * 兑换人姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户姓名", index = 0)
+    private String personName;
+
+    /**
+     * 兑换人手机
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "手机号", index = 2)
+    private String phone;
+
+    /**
+     * 物品名称
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "商品名称", index = 3)
+    private String targetName;
+
+
+    /**
+     * 状态
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "状态", index = 6)
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "兑换时间", index = 4)
+    private String createDate;
+
+    /**
+     * 领取时间
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "领取时间", index = 5)
+    private String verifyDate;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户类型", index = 1)
+    private String personType;
+
+}

src/main/java/com/huiju/estateagents/excel/TpBuildingOwnerInfoExport.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class TpBuildingOwnerInfoExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String ownerName;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String ownerTel;
+
+    @ColumnWidth(25)
+    @ExcelProperty(value = "身份证", index = 2)
+    private String idCard;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "性别", index = 3)
+    private String sex;
+
+    @ColumnWidth(60)
+    @ExcelProperty(value = "房间号", index = 4)
+    private String roomNoName;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "身份", index = 5)
+    private String roleName;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "审核状态", index = 6)
+    private String verifyStatus;
+
+    @ColumnWidth(25)
+    @ExcelProperty(value = "操作时间", index = 7)
+    private String createDate;
+}

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -67,6 +67,7 @@ public class AccessInterceptor implements HandlerInterceptor {
 		    "/api/center/signin",
             "/api/channel/signin",
 		    "/api/admin/taUser/signin",
+            "/api/admin/image-captcha",
             "/swagger-resources/configuration/ui",
             "/swagger-resources",
             "/v2/api-docs",

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

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -46,4 +47,6 @@ public interface TaActivityDynamicEnlistMapper extends BaseMapper<TaActivityDyna
      * @return
      */
     List<HelpInitiateRecordSucceed> getTaActivityDynamicEnlistExport(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("dynamicId") String dynamicId, @Param("isCheckin") String isCheckin, @Param("name") String name, @Param("phone") String phone,@Param("orgId") Integer orgId);
+
+    Map<String, Integer> getLastActEnlistNum(Integer orgId);
 }

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

@@ -258,4 +258,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
 
     Integer cancelConsulatant(@Param("personId") String personId);
+
+    IPage<TaPerson> getPersonBy(IPage<TaPerson> page, @Param("orgId") Integer orgId, @Param("name") String name,  @Param("phone") String phone, @Param("recommended") String recommended);
+
 }

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

@@ -6,6 +6,7 @@ import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -21,4 +22,7 @@ import java.util.List;
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
 	
 	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+	@Select("select count(*) from ta_points_exchange t where t.org_id = #{orgId}")
+    int getTotalNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/controller/AnnouncementTelController.java

@@ -48,7 +48,9 @@ public class AnnouncementTelController extends BaseController {
 
 	})
 	@RequestMapping(value = "/admin/announcement-tels",method = RequestMethod.GET)
-	public ResponseBean getList(@RequestParam(value = "name", required = false) String name,
+	public ResponseBean getList(@RequestParam(value = "type") String type,
+								@RequestParam(value = "communityId", required = false) Integer communityId,
+								@RequestParam(value = "name", required = false) String name,
                                 @RequestParam(value = "tel", required = false) String tel,
                                 @RequestParam(value = "remark", required = false) String remark,
                                 @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
@@ -59,7 +61,9 @@ public class AnnouncementTelController extends BaseController {
 		announcementTel.setOrgId(userElement.getOrgId());
 		announcementTel.setName(name);
 		announcementTel.setTel(tel);
+		announcementTel.setType(type);
 		announcementTel.setRemark(remark);
+		announcementTel.setCommunityId(communityId);
 		responseBean = announcementTelService.getTelList(announcementTel,pageNum,pageSize);
 		return responseBean;
 	}

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -4,7 +4,8 @@ package com.huiju.estateagents.property.controller;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.property.model.Bill;
 import com.huiju.estateagents.property.service.IBillService;
 import io.swagger.annotations.Api;
@@ -20,9 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.OutputStream;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -52,17 +51,23 @@ public class BillController extends BaseController {
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
     })
     @RequestMapping(value = "/admin/bills",method = RequestMethod.GET)
-    public ResponseBean getList(@RequestParam(value = "billId", required = false) Integer billId,
+    public ResponseBean getList(@RequestParam("communityId") Integer communityId,
+                                @RequestParam(value = "billId", required = false) Integer billId,
                                 @RequestParam(value = "billName", required = false) String billName,
-                                @RequestParam(value = "billExplain", required = false) String billExplain,
+                                @RequestParam(value = "startDate", required = false) String startDate,
+                                @RequestParam(value = "endDate", required = false) String endDate,
+                                @RequestParam(value = "isTicket", required = false) Boolean isTicket,
                                 @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         Bill bill = new Bill();
         bill.setId(billId);
+        bill.setCommunityId(communityId);
         bill.setBillName(billName);
-        bill.setBillExplain(billExplain);
+        bill.setIsTicket(isTicket);
+        bill.setStartDate(!StringUtils.isEmpty(startDate) ? DateUtils.parse(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss") : null);
+        bill.setEndDate(!StringUtils.isEmpty(startDate) ? DateUtils.parse(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss") : null);
         bill.setOrgId(userElement.getOrgId());
         responseBean = iBillService.getBillList(bill,pageNum,pageSize);
         return responseBean;
@@ -91,23 +96,21 @@ public class BillController extends BaseController {
     // @ApiOperation(value = "上传缴费项接口, 保存/修改", notes = "上传缴费项接口, 保存/修改")
     @PostMapping(value = "/admin/bill/uploadExcel/add", consumes = "multipart/*", headers = "content-type=multipart/form-data")
     public ResponseBean addUploadExcel(HttpServletRequest request,
+                                       @RequestParam("communityId") Integer communityId,
                                        @RequestParam(value = "billId", required = false) Integer billId,
                                        @RequestParam(value = "file", required = false) MultipartFile file,
-                                       @RequestParam("billExplain") String billExplain,
+//                                       @RequestParam("billExplain") String billExplain,
                                        @RequestParam("billName") String billName,
-                                       @RequestParam("endDate") Date endDate,
+                                       @RequestParam("startDate") String startDate,
+                                       @RequestParam("endDate") String endDate,
                                        @RequestParam("billStatus") String billStatus) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        Date date = null;
-//        try {
-//            String d = simpleDateFormat.format(new Long(endDate));
-//            date = simpleDateFormat.parse(d);
-//        } catch (ParseException e) {
-//            e.printStackTrace();
-//        }
-        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, endDate, billStatus, userElement);
+
+        LocalDateTime stDate = DateUtils.parse(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        LocalDateTime edDate = DateUtils.parse(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+
+        responseBean = iBillService.saveExcelData(billId, file, communityId, billName, stDate, edDate, billStatus, userElement);
         return responseBean;
     }
 
@@ -149,9 +152,12 @@ public class BillController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/bill/downloadExcel", method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
+    public void exportExcel(@RequestParam(value = "communityId") Integer communityId,
+                            @RequestParam(value = "phaseId",required = false) String phaseId,
+                            @RequestParam(value = "buildingId",required = false) String buildingId,
+                            HttpServletResponse response, HttpServletRequest request) {
         TaUser userElement = getTaUser(request);
-        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement).getData();
+        HSSFWorkbook workbook = (HSSFWorkbook) iBillService.downloadExcel(userElement,communityId, phaseId,buildingId).getData();
 //        this.setResponseHeader(response, "缴费单模板.xls");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

@@ -6,6 +6,7 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.model.Bill;
 import com.huiju.estateagents.property.model.BillInvoice;
 import com.huiju.estateagents.property.service.IBillInvoiceService;
 import com.huiju.estateagents.property.service.IBillService;
@@ -64,11 +65,11 @@ public class BillInvoiceController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/bill/invoice/updateBill", method = RequestMethod.PUT)
-    public ResponseBean updateBill(HttpServletRequest request, @RequestBody String parameter) {
+    public ResponseBean updateBill(HttpServletRequest request, @RequestBody Bill bill) {
         ResponseBean responseBean = new ResponseBean();
 
         TaUser userElement = getTaUser(request);
-        responseBean = iBillService.updateBillNameAndBillExplainAndEndDate(userElement, parameter);
+        responseBean = iBillService.updateBillNameAndBillExplainAndEndDate(userElement, bill);
         return responseBean;
     }
 
@@ -204,9 +205,11 @@ public class BillInvoiceController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         HSSFWorkbook workbook = (HSSFWorkbook) iBillInvoiceService.exportExcel(userElement, billId).getData();
-        this.setResponseHeader(response, "缴费单.xls");
         //响应到客户端
         try {
+            response.setContentType("application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename=缴费单.xlsx");
              OutputStream os = response.getOutputStream();
              workbook.write(os);
              os.flush();

src/main/java/com/huiju/estateagents/property/controller/BuildingOwnerInfoController.java

@@ -2,12 +2,18 @@ package com.huiju.estateagents.property.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.DateUtils;
+import com.huiju.estateagents.common.ExcelUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.excel.TpBuildingOwnerInfoExport;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TaFace;
 import com.huiju.estateagents.property.model.TaUserVerify;
+import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
 import com.huiju.estateagents.property.service.IBuildingOwnerInfoService;
 import com.huiju.estateagents.property.service.ITaFaceService;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
@@ -24,7 +30,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -66,6 +74,59 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 业主导出
+     * @param parameter
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/buildingInfo/list/export", method = RequestMethod.POST)
+    public ResponseBean getListExport(@RequestBody String parameter,
+                                      HttpServletRequest request,
+                                      HttpServletResponse response){
+        ResponseBean responseBean = new ResponseBean();
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.listQuery(parameter, userElement);
+
+        List<TpBuildingOwnerInfo> records = (List<TpBuildingOwnerInfo>) ((Map<String, Object>) responseBean.getData()).get("list");
+
+        if (null != records) {
+            List<TpBuildingOwnerInfoExport> list = new ArrayList<>();
+            for (TpBuildingOwnerInfo item: records) {
+                TpBuildingOwnerInfoExport ownerInfo = new TpBuildingOwnerInfoExport();
+                ownerInfo.setOwnerName(item.getOwnerName());
+                ownerInfo.setIdCard(item.getIdCard());
+                ownerInfo.setOwnerTel(item.getOwnerTel());
+                ownerInfo.setSex(getSexFromIdCard(item.getIdCard()));
+                ownerInfo.setRoomNoName(item.getPhaseName()+item.getBuildingName()+item.getUnitName()+item.getLevelName()+item.getRoomNoName());
+                ownerInfo.setRoleName(item.getRoleName());
+                ownerInfo.setVerifyStatus("0".equals(item.getVerifyStatus()) ? "未审核" : ("1".equals(item.getVerifyStatus()) ? "审核通过" : ("1".equals(item.getVerifyStatus()) ? "审核不通过": "") ));
+                ownerInfo.setCreateDate(DateUtils.format(item.getCreateDate(), "yyyy-MM-dd HH:mm"));
+                list.add(ownerInfo);
+            }
+
+            try {
+                ExcelUtils.flush(response, TpBuildingOwnerInfoExport.class, list, "业主记录.xlsx");
+                return null;
+            } catch (IOException e) {
+                return ResponseBean.error("导出 Excel 失败 "+ e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
+        return responseBean;
+    }
+
+    private String getSexFromIdCard(String idCard) {
+        if (StringUtils.isEmpty(idCard) || idCard.length() != 18) {
+            return null;
+        }
+
+        String sign = idCard.split("")[16];
+
+        return Integer.parseInt(sign) % 2 == 1 ? "男" : "女";
+    }
+
+
     // @ApiOperation(value = "获取楼栋业主审核详情", notes = "获取楼栋业主审核详情")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "userVerifyId",value = "审核Id")
@@ -159,14 +220,25 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
 
+    private List<Integer> getCommunityIdsBy(String communityIds) {
+        List<Integer> communityIdList = new ArrayList<>();
+        String[] parts = communityIds.split(",");
+        for (String id : parts) {
+            communityIdList.add(Integer.parseInt(id));
+        }
+        return communityIdList;
+    }
+
     // @ApiOperation(value = "查询 期区", notes = "查询 期区")
     @ApiImplicitParams({
     })
     @RequestMapping(value = "/admin/buildingInfo/phase",method = RequestMethod.GET)
-    public ResponseBean getPhaseList(HttpServletRequest request){
+    public ResponseBean getPhaseList(@RequestParam Integer communityId,
+                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+
         TaUser userElement = getTaUser(request);
-        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getOrgId());
+        responseBean = iBuildingOwnerInfoService.getPhaseList(userElement.getOrgId(), communityId);
         return responseBean;
     }
     
@@ -228,11 +300,13 @@ public class BuildingOwnerInfoController extends BaseController {
  
     // @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
     @PostMapping(value = "/admin/buildingInfo/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+    public ResponseBean submitExcel(@RequestParam("file") MultipartFile file,
+                                    @RequestParam("communityId") Integer communityId,
+                                    HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         try {
-            responseBean = iBuildingOwnerInfoService.submitExcelData(file,userElement);
+            responseBean = iBuildingOwnerInfoService.submitExcelData(file, communityId, userElement);
         }catch (Exception e){
             responseBean.addError("导入数据失败" + e.getMessage());
             e.printStackTrace();
@@ -303,9 +377,11 @@ public class BuildingOwnerInfoController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/buildingInfo/downloadExcel", method = RequestMethod.GET)
-    public void exportExcel(HttpServletResponse response, HttpServletRequest request) {
+    public void exportExcel(@RequestParam Integer communityId,
+                            HttpServletResponse response,
+                            HttpServletRequest request) {
         TaUser userElement = getTaUser(request);
-        XSSFWorkbook workbook = (XSSFWorkbook) iBuildingOwnerInfoService.downloadExcel(userElement).getData();
+        XSSFWorkbook workbook = (XSSFWorkbook) iBuildingOwnerInfoService.downloadExcel(communityId, userElement).getData();
 //        this.setResponseHeader(response, "业主资料库.xlsx");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");

src/main/java/com/huiju/estateagents/property/controller/BuildingTreeController.java

@@ -15,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.Map;
 
 /**
  * @author FXF
@@ -39,10 +40,16 @@ public class BuildingTreeController extends BaseController {
 	
 	// @ApiOperation(value = "上传楼栋信息并入库", notes = "上传楼栋信息并入库")
 	@PostMapping(value = "/admin/buildingInfo/tree/submitExcel", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-	public ResponseBean submitExcel(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+	public ResponseBean submitExcel(@RequestParam("file") MultipartFile file,
+									@RequestParam("communityId") Integer communityId,
+									HttpServletRequest request) {
+		if (null == communityId || communityId < 1) {
+			return ResponseBean.error("请设置上传小区", ResponseBean.ERROR_MISSING_PARAMS);
+		}
+
 		ResponseBean responseBean = new ResponseBean();
 		TaUser userElement = getTaUser(request);
-		responseBean = buildingTreeService.submitExcelData(file,userElement);
+		responseBean = buildingTreeService.submitExcelData(file, communityId, userElement);
 		return responseBean;
 	}
 	
@@ -72,6 +79,17 @@ public class BuildingTreeController extends BaseController {
 		return responseBean;
 	}
 
+	// @ApiOperation(value = "添加当前节点", notes = "添加当前节点")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;" +
+					"name:节点名称;type：(phase:(期)，building:(栋),unit:(单元),level:(楼层),roomNo:(房间号)), roomNonodeNumber:输入的节点")
+	})
+	@RequestMapping(value = "/admin/buildingInfo/updatenode",method = RequestMethod.POST)
+	public ResponseBean editNode(@RequestBody Map<String, Object> parameter, HttpServletRequest request){
+		TaUser userElement = getTaUser(request);
+		return buildingTreeService.editNode(parameter, userElement.getOrgId());
+	}
+
 	// @ApiOperation(value = "删除当前节点", notes = "删除当前节点")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "id:当前节点;type:(end:(房间)，roomNo:(楼层),level:(单元)，unit:(楼栋),building:(期))")

src/main/java/com/huiju/estateagents/property/controller/IndexCountController.java

@@ -3,19 +3,17 @@ package com.huiju.estateagents.property.controller;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.service.IndexCountServiceI;
+import com.huiju.estateagents.property.service.*;
 import com.google.common.collect.Maps;
-import io.swagger.annotations.ApiImplicitParam;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaPointsExchangeService;
 import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -23,12 +21,33 @@ import java.util.Map;
  * @date 2019-05-28
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class IndexCountController extends BaseController {
 	
 	@Autowired
 	private IndexCountServiceI indexCountService;
-	
+
+	@Autowired
+	BuildingTreeServiceI buildingTreeService;
+
+	@Autowired
+	IBuildingOwnerInfoService iBuildingOwnerInfoService;
+
+	@Autowired
+	IBillService iBillService;
+
+	@Autowired
+	TpTicketService tpTicketService;
+
+	@Autowired
+	ITaUserVerifyService iTaUserVerifyService;
+
+	@Autowired
+	ITaPointsExchangeService iTaPointsExchangeService;
+
+	@Autowired
+	ITaBuildingDynamicService iTaBuildingDynamicService;
+
 	// @ApiOperation(value = "获取物业端首页所有统计数据", notes = "获取物业端首页所有统计数据")
 	@ApiImplicitParams({
 
@@ -47,4 +66,83 @@ public class IndexCountController extends BaseController {
 		responseBean.addSuccess(indexCountMap);
 		return responseBean;
 	}
+
+	@GetMapping("/admin/dashboard/statis")
+	public ResponseBean getDashboardStatis(@RequestParam("startDate") String startDate,
+										   @RequestParam("endDate") String endDate,
+										   HttpServletRequest request) {
+		Integer orgId = getOrgId(request);
+
+		// 楼栋
+		int buildingNum = buildingTreeService.getRoomNum(orgId);
+		// 业主
+		int propNum = iBuildingOwnerInfoService.getAvailableProp(orgId);
+		// 缴费
+		int houseNum = iBillService.getBillHouse(orgId, startDate, endDate);
+		// 工单
+		int ticketNum = tpTicketService.getTicketNum(orgId, startDate, endDate);
+
+		Map<String, Object> res = new HashMap<>();
+		res.put("buildingNum", buildingNum);
+		res.put("propNum", propNum);
+		res.put("houseNum", houseNum);
+		res.put("ticketNum", ticketNum);
+
+		return ResponseBean.success(res);
+	}
+
+	@GetMapping("/admin/dashboard/dynamic")
+	public ResponseBean getDashboardDynamic(@RequestParam("startDate") String startDate,
+										   @RequestParam("endDate") String endDate,
+										   HttpServletRequest request) {
+		Integer orgId = getOrgId(request);
+
+		// 工单
+		List<Map<String, Object>> ticketList = tpTicketService.getTicketMapList(orgId, startDate, endDate);
+
+		// 业主
+		List<Map<String, Object>> propList = iTaUserVerifyService.getVerifyMapList(orgId, startDate, endDate);
+
+		// 缴费
+		List<Map<String, Object>> billList = iBillService.getBillMapList(orgId, startDate, endDate);
+
+		Map<String, Object> res = new HashMap<>();
+		res.put("ticketList", ticketList);
+		res.put("propList", propList);
+		res.put("billList", billList);
+
+		return ResponseBean.success(res);
+	}
+
+
+	@GetMapping("/admin/dashboard/house-verified")
+	public ResponseBean getDashboardHouseVerified(HttpServletRequest request) {
+		Integer orgId = getOrgId(request);
+
+		Map<String, Object> houseList = iBuildingOwnerInfoService.getVerifyNum(orgId);
+
+		return ResponseBean.success(houseList);
+	}
+
+	@GetMapping("/admin/dashboard/tips")
+	public ResponseBean getDashboardTips(HttpServletRequest request) {
+		Integer orgId = getOrgId(request);
+
+		// 待处理工单
+		int ticketNum = tpTicketService.getStartNum(orgId);
+		// 待审核业主
+		int verifyNum = iTaUserVerifyService.getNoVerifyNum(orgId);
+		// 兑换列表
+		int exchangeNum = iTaPointsExchangeService.getTotalNum(orgId);
+		// 近期在进行的活动
+		Map<String, Integer> enlistNum = iTaBuildingDynamicService.getLastActEnlistNum(orgId);
+
+		Map<String, Object> res = new HashMap<>();
+		res.put("ticketNum", ticketNum);
+		res.put("verifyNum", verifyNum);
+		res.put("exchangeNum", exchangeNum);
+		res.put("enlistNum", enlistNum);
+
+		return ResponseBean.success(res);
+	}
 }

src/main/java/com/huiju/estateagents/property/controller/TpCommunityController.java

@@ -0,0 +1,160 @@
+package com.huiju.estateagents.property.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.CommConstant;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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 com.huiju.estateagents.property.service.ITpCommunityService;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+
+@Api(tags = "")
+@RestController
+@RequestMapping("/api")
+public class TpCommunityController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TpCommunityController.class);
+
+    @Autowired
+    public ITpCommunityService iTpCommunityService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/tpCommunity",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tpCommunityList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable("client") String client,
+                                        @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        HttpServletRequest request) throws Exception{
+
+		    IPage<TpCommunity> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TpCommunity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("wx".equals(client), "status", CommConstant.STATUS_NORMAL);
+            queryWrapper.gt("admin".equals(client), "status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TpCommunity> result = iTpCommunityService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param tpCommunity 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/tpCommunity",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean tpCommunityAdd(@ApiParam("保存内容") @RequestBody TpCommunity tpCommunity,
+                                       HttpServletRequest request) throws Exception{
+
+        tpCommunity.setOrgId(getOrgId(request));
+
+        if (iTpCommunityService.save(tpCommunity)){
+            return ResponseBean.success(tpCommunity);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/tpCommunity/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean tpCommunityDelete(@ApiParam("对象ID") @PathVariable Integer id,
+                                          HttpServletRequest request) throws Exception{
+
+        TpCommunity tpCommunity = iTpCommunityService.getById(id);
+        if (null == tpCommunity || CommConstant.STATUS_DELETE.equals(tpCommunity.getStatus())) {
+            return ResponseBean.error("没有找到对应的社区信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        if (!orgId.equals(tpCommunity.getOrgId())) {
+            return ResponseBean.error("暂无操作权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        tpCommunity.setStatus(CommConstant.STATUS_DELETE);
+
+        return tpCommunityUpdate(id, tpCommunity, request);
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tpCommunity 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/tpCommunity/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean tpCommunityUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                          @ApiParam("更新内容") @RequestBody TpCommunity tpCommunity,
+                                          HttpServletRequest request) throws Exception{
+        tpCommunity.setId(id);
+
+        Integer orgId = getOrgId(request);
+        if (!orgId.equals(tpCommunity.getOrgId())) {
+            return ResponseBean.error("暂无操作权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (iTpCommunityService.updateById(tpCommunity)){
+            return ResponseBean.success(iTpCommunityService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/tpCommunity/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean tpCommunityGet(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable("client") String client,
+                                       @ApiParam("对象ID") @PathVariable Integer id,
+                                       HttpServletRequest request) throws Exception{
+
+        TpCommunity tpCommunity = iTpCommunityService.getById(id);
+        if (null == tpCommunity || CommConstant.STATUS_DELETE.equals(tpCommunity.getStatus())) {
+            return ResponseBean.error("没有找到对应的社区信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        if (!orgId.equals(tpCommunity.getOrgId())) {
+            return ResponseBean.error("暂无操作权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(tpCommunity);
+    }
+}

src/main/java/com/huiju/estateagents/property/controller/TpRoomNoController.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.property.controller;
+
+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.property.model.TpRoomNo;
+import com.huiju.estateagents.property.service.BuildingTreeServiceI;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+@Api(tags = "楼栋房源信息表 ")
+@RestController
+@RequestMapping("/api/{client}/buildingInfo/building-room")
+public class TpRoomNoController extends BaseController {
+
+    @Autowired
+    BuildingTreeServiceI buildingTreeService;
+
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @GetMapping("/list")
+    public ResponseBean getList(@ApiParam(value = "客户端", allowableValues = "admin") @PathVariable String client,
+                                @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("期数ID") @RequestParam(value ="phaseId", required = false) Integer phaseId,
+                                @ApiParam("楼栋ID") @RequestParam(value ="buildingId", required = false) Integer buildingId,
+                                @ApiParam("单元ID") @RequestParam(value ="unitId", required = false) Integer unitId,
+                                @ApiParam("楼层ID") @RequestParam(value ="levelId", required = false) Integer levelId,
+                                @ApiParam("户号ID") @RequestParam(value ="roomNoId", required = false) Integer roomNoId,
+                                HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        IPage<TpRoomNo> page = new Page<>(pageNum, pageSize);
+
+        IPage<TpRoomNo> result = buildingTreeService.getRoomList(page, orgId, phaseId, buildingId, unitId, levelId, roomNoId);
+
+        return ResponseBean.success(result);
+    }
+
+}

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -153,7 +153,7 @@ public class TpTicketController extends BaseController {
     @RequestMapping(value = "/admin/updateTicketStatus", method = RequestMethod.POST)
     public ResponseBean updateTicketStatus(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
-        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());
+        ResponseBean  responseBean = tpTicketService.updateTicketStatus(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getPhone());
         return responseBean;
     }
 
@@ -165,7 +165,7 @@ public class TpTicketController extends BaseController {
     @RequestMapping(value = "/admin/updateTicket", method = RequestMethod.POST)
     public ResponseBean updateTicket(@RequestBody String parameter, HttpServletRequest request){
         TaUser userElement = getTaUser(request);
-        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getLoginName());
+        ResponseBean  responseBean = tpTicketService.updateTicket(parameter,userElement.getUserId(),userElement.getOrgId(),userElement.getUserName(),userElement.getPhone());
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/property/controller/UserVerifyController.java

@@ -34,13 +34,15 @@ public class UserVerifyController extends BaseController {
     @RequestMapping(value = "/admin/prop-user/verify/all", method = RequestMethod.GET)
     // @ApiOperation(value = "获取待审核的用户列表", notes = "获取待审核的用户列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "communityId", value = "小区ID"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "phone", value = "手机号"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "userName", value = "用户名"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "idCard", value = "身份证"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageNum", value = "第几页"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "pageSize", value = "一页多少行"),
     })
-    public ResponseBean getAll(@RequestParam(value = "phone", required = false) String phone,
+    public ResponseBean getAll(@RequestParam(value = "communityId") Integer communityId,
+                               @RequestParam(value = "phone", required = false) String phone,
                                @RequestParam(value = "userName", required = false) String userName,
                                @RequestParam(value = "idCard", required = false) String idCard,
                                @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@@ -49,7 +51,7 @@ public class UserVerifyController extends BaseController {
 
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
-        responseBean = iTaUserVerifyService.selectAll(phone, userName, idCard, pageNum, pageSize, userElement);
+        responseBean = iTaUserVerifyService.selectAll(communityId, phone, userName, idCard, pageNum, pageSize, userElement);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java

@@ -23,12 +23,13 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
     /**
      * 根据 手机号 、用户名、身份证
      * @param page
+     * @param communityId
      * @param phone
      * @param userName
      * @param idCard
      * @return
      */
-    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard, @Param("orgId") Integer orgId);
+    IPage<TaUserVerify> selectAllByPhoneAndUserNameAndIdCard(Page page, Integer communityId, @Param("phone") String phone, @Param("userName") String userName, @Param("idCard") String idCard, @Param("orgId") Integer orgId);
 
     /**
      * 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
@@ -167,4 +168,8 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
     Page<Map<String, String>> getPropUserByPaged(Page<Map<String, String>> page, @Param("orgId") Integer orgId);
 
     Page<Map<String, String>> getPropUserByBirday(Page<Map<String, String>> page, @Param("orgId") Integer orgId, @Param("birthday") String birthday);
+
+    List<Map<String, Object>> getVerifyMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate,@Param("endDate") String endDate);
+
+    int getNoVerifyNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpBillOrderMapper.java

@@ -84,4 +84,7 @@ public interface TpBillOrderMapper extends BaseMapper<TpBillOrder> {
     List<TpBillOrder> selectByOrderBumber(@Param("orderNumber") String orderNumber);
 
 
+    int getBillHouse(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    List<Map<String, Object>> getBillMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 }

src/main/java/com/huiju/estateagents/property/dao/TpBuildingMapper.java

@@ -27,4 +27,11 @@ public interface TpBuildingMapper extends BaseMapper<TpBuilding> {
     @ResultType(TpBuilding.class)
     @Select("select * from tp_building where org_id=#{orgId} and phase_id=#{phaseId}")
     List<TpBuilding> selectByAddress(@Param("orgId") Integer orgId, @Param("phaseId") Integer phaseId);
+
+    @Update("update tp_building set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
+
+    @Update("update tp_building set phase_name = #{phaseName} where org_id=#{orgId} and phase_id=#{phaseId}")
+    int updatePhaseName(@Param("orgId") Integer orgId,  @Param("phaseId") Integer phaseId, @Param("phaseName") String phaseName);
+
 }

src/main/java/com/huiju/estateagents/property/dao/TpBuildingOwnerInfoMapper.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -80,4 +81,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
     TpBuildingOwnerInfo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
 
 
+    int getAvailableProp(Integer orgId);
+
+    Map<String, Object> getVerifyNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpLevelMapper.java

@@ -2,10 +2,7 @@ package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.model.TpLevel;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.ResultType;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -30,4 +27,16 @@ public interface TpLevelMapper extends BaseMapper<TpLevel> {
     @ResultType(TpLevel.class)
     @Select("select * from tp_level where org_id=#{orgId} and phase_id=#{phaseId} and building_id=#{buildingId} and unit_id=#{unitId}")
     List<TpLevel> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId);
+
+    @Update("update tp_level set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
+
+    @Update("update tp_level set phase_name = #{phaseName} where org_id=#{orgId} and phase_id=#{phaseId}")
+    int updatePhaseName(@Param("orgId") Integer orgId,  @Param("phaseId") Integer phaseId, @Param("phaseName") String phaseName);
+
+    @Update("update tp_level set building_name = #{buildingName} where org_id=#{orgId} and building_id=#{buildingId}")
+    int updateBuildingName(@Param("orgId") Integer orgId, @Param("buildingId") Integer buildingId, @Param("buildingName") String buildingName);
+
+    @Update("update tp_level set unit_name = #{unitName} where org_id=#{orgId} and unit_id=#{unitId}")
+    int updateUnitName(@Param("orgId") Integer orgId, @Param("unitId") Integer unitId, @Param("unitName") String unitName);
 }

src/main/java/com/huiju/estateagents/property/dao/TpPhaseMapper.java

@@ -26,4 +26,6 @@ public interface TpPhaseMapper extends BaseMapper<TpPhase> {
     @Select("select * from tp_phase where org_id = #{orgId}")
     List<TpPhase> selectByAddress(@Param("orgId") Integer orgId);
 
+    @Update("update tp_phase set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
 }

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.property.model.TpRoomNo;
 import org.apache.ibatis.annotations.*;
 
@@ -46,7 +47,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      */
     @ResultType(TpRoomNo.class)
 //    @Select("select * from tp_room_no where org_id = #{orgId} limit #{pageNum},#{pageSize}")
-    List<TpRoomNo> selectCommunityIdList(@Param("orgId") Integer orgId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+    List<TpRoomNo> selectCommunityIdList(@Param("orgId") Integer orgId, @Param("communityId") Integer communityId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
      * 查询数据，分页
@@ -55,7 +56,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      */
     @ResultType(Long.class)
 //    @Select("select count(1) from tp_room_no where org_id = #{orgId}")
-    Long selectCommunityIdCount(@Param("orgId") Integer orgId);
+    Long selectCommunityIdCount(@Param("orgId") Integer orgId, @Param("communityId") Integer communityId);
 
     @ResultType(TpRoomNo.class)
 //    @Select("select * from tp_room_no where org_id=#{orgId} " +
@@ -65,4 +66,24 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
 //            "and level_id=#{levelId}")
     List<TpRoomNo> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
 
+    List<TpRoomNo> selectComunityList(@Param("orgId") Integer orgId, @Param("communityId") Integer communityId, @Param("phaseId") String phaseId, @Param("buildingId") String buildingId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
+    IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, @Param("orgId") Integer orgId,@Param("phaseId") Integer phaseId,@Param("buildingId") Integer buildingId,@Param("unitId") Integer unitId,@Param("levelId") Integer levelId,@Param("roomNoId") Integer roomNoId);
+
+    @Update("update tp_room_no set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
+
+    @Update("update tp_room_no set phase_name = #{phaseName} where org_id=#{orgId} and phase_id=#{phaseId}")
+    int updatePhaseName(@Param("orgId") Integer orgId,  @Param("phaseId") Integer phaseId, @Param("phaseName") String phaseName);
+
+    @Update("update tp_room_no set building_name = #{buildingName} where org_id=#{orgId} and building_id=#{buildingId}")
+    int updateBuildingName(@Param("orgId") Integer orgId, @Param("buildingId") Integer buildingId, @Param("buildingName") String buildingName);
+
+    @Update("update tp_room_no set unit_name = #{unitName} where org_id=#{orgId} and unit_id=#{unitId}")
+    int updateUnitName(@Param("orgId") Integer orgId, @Param("unitId") Integer unitId, @Param("unitName") String unitName);
+
+    @Update("update tp_room_no set level_name = #{levelName} where org_id=#{orgId} and level_id=#{levelId}")
+    int updateLevelName(@Param("orgId") Integer orgId, @Param("levelId") Integer levelId, @Param("levelName") String levelName);
+
+    int getRoomNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpTicketMapper.java

@@ -35,4 +35,10 @@ public interface TpTicketMapper extends BaseMapper<TpTicket> {
     TpTicket selectTpTicketName(@Param("orgId")Integer orgId, @Param("type")String type, @Param("ticketTitle")String ticketTitle);
 
     void updateTpUserId(@Param("ticketId") Integer ticketId);
+
+    int getTicketNum(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    List<Map<String, Object>> getTicketMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate,  @Param("endDate") String endDate);
+
+    int getStartNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpUnitMapper.java

@@ -2,10 +2,7 @@ package com.huiju.estateagents.property.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.property.model.TpUnit;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.ResultType;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -31,4 +28,12 @@ public interface TpUnitMapper extends BaseMapper<TpUnit> {
     @Select("select * from tp_unit where org_id =#{orgId} and phase_id=#{phaseId} and building_id=#{buildingId}")
     List<TpUnit> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId);
 
+    @Update("update tp_unit set `name` = #{name} where id = #{id}")
+    int updateName(@Param("orgId") Integer orgId, @Param("id") Integer id, @Param("name") String name);
+
+    @Update("update tp_unit set phase_name = #{phaseName} where org_id=#{orgId} and phase_id=#{phaseId}")
+    int updatePhaseName(@Param("orgId") Integer orgId,  @Param("phaseId") Integer phaseId, @Param("phaseName") String phaseName);
+
+    @Update("update tp_unit set building_name = #{buildingName} where org_id=#{orgId} and building_id=#{buildingId}")
+    int updateBuildingName(@Param("orgId") Integer orgId, @Param("buildingId") Integer buildingId, @Param("buildingName") String buildingName);
 }

src/main/java/com/huiju/estateagents/property/entity/TaUserCommunity.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.property.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaUserCommunity对象", description="")
+public class TaUserCommunity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "小区ID")
+    private Integer communityId;
+
+    @ApiModelProperty(value = "所属机构")
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/property/entity/TpBillType.java

@@ -0,0 +1,47 @@
+package com.huiju.estateagents.property.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TpBillType 对象", description="")
+public class TpBillType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "所属机构")
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/property/entity/TpCommunity.java

@@ -0,0 +1,46 @@
+package com.huiju.estateagents.property.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TpCommunity对象", description="")
+public class TpCommunity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "小区ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "小区名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "所属机构")
+    private Integer orgId;
+
+
+}

src/main/java/com/huiju/estateagents/property/mapper/TaUserCommunityMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.property.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.entity.TaUserCommunity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Mapper
+public interface TaUserCommunityMapper extends BaseMapper<TaUserCommunity> {
+
+}

src/main/java/com/huiju/estateagents/property/mapper/TpBillTypeMapper.java

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.property.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.property.entity.TpBillType;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Mapper
+public interface TpBillTypeMapper extends BaseMapper<TpBillType> {
+}

src/main/java/com/huiju/estateagents/property/mapper/TpCommunityMapper.java

@@ -0,0 +1,21 @@
+package com.huiju.estateagents.property.mapper;
+
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Mapper
+public interface TpCommunityMapper extends BaseMapper<TpCommunity> {
+
+    List<TpCommunity> getListOfUser(Integer orgId, Integer userId);
+}

src/main/java/com/huiju/estateagents/property/model/AnnouncementTel.java

@@ -31,10 +31,12 @@ public class AnnouncementTel implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    private Integer orgId;
+
     /**
      * 小区id
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 电话名称

src/main/java/com/huiju/estateagents/property/model/Bill.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -32,6 +33,8 @@ public class Bill implements Serializable {
     /**
      * 小区id
      */
+    private Integer communityId;
+
     private Integer orgId;
 
     /**
@@ -66,10 +69,12 @@ public class Bill implements Serializable {
      */
     private String billStatus;
 
+    private LocalDateTime startDate;
+
     /**
      * 截止时间
      */
-    private Date endDate;
+    private LocalDateTime endDate;
 
     /**
      * 创建人
@@ -91,5 +96,13 @@ public class Bill implements Serializable {
      */
     private Date updateDate;
 
+    /**
+     * 收费类型
+     */
+    private Integer typeId;
 
+    /**
+     * 是否工单费用
+     */
+    private Boolean isTicket;
 }

src/main/java/com/huiju/estateagents/property/model/BillInvoice.java

@@ -30,11 +30,10 @@ public class BillInvoice implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    /**
-     * 小区id
-     */
     private Integer orgId;
 
+    private Integer communityId;
+
     /**
      * 收费项id
      */

src/main/java/com/huiju/estateagents/property/model/TaUserVerify.java

@@ -33,10 +33,12 @@ public class TaUserVerify implements Serializable {
      */
     private String personId;
 
+    private Integer orgId;
+
     /**
      * 小区id
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 角色ID

src/main/java/com/huiju/estateagents/property/model/TpAnnouncement.java

@@ -22,9 +22,11 @@ public class TpAnnouncement implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    /** 小区id**/
     private Integer orgId;
 
+    /** 小区id**/
+    private Integer communityId;
+
     /**公告标题**/
     private String announcementTitle;
 
@@ -79,4 +81,10 @@ public class TpAnnouncement implements Serializable {
     @TableField(exist = false)
     private List<String> imgList;
 
+    @TableField(exist = false)
+    private String startCreateDate;
+
+    @TableField(exist = false)
+    private String endCreateDate;
+
 }

src/main/java/com/huiju/estateagents/property/model/TpBillOrder.java

@@ -31,10 +31,12 @@ public class TpBillOrder implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    private Integer orgId;
+
     /**
      * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 缴费项ID
@@ -124,4 +126,10 @@ public class TpBillOrder implements Serializable {
      */
     @TableField(exist = false)
     private List<BillInvoice> billList;
+
+    /**
+     * 缴费时间
+     */
+    @TableField(exist = false)
+    private LocalDateTime createTime;
 }

src/main/java/com/huiju/estateagents/property/model/TpBuilding.java

@@ -16,10 +16,13 @@ public class TpBuilding implements Serializable {
 	
 	@TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+
+    private Integer orgId;
+
     /**
      * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
     
     /**
      * 期区id

src/main/java/com/huiju/estateagents/property/model/TpBuildingOwnerInfo.java

@@ -32,11 +32,13 @@ public class TpBuildingOwnerInfo implements Serializable {
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
+
+    private Integer orgId;
+
     /**
      * 小区id
      */
-    private Integer orgId;
+    private Integer communityId;
     
     /**
      * 身份证号码

src/main/java/com/huiju/estateagents/property/model/TpLevel.java

@@ -28,11 +28,13 @@ public class TpLevel implements Serializable {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
+
+    private Integer orgId;
+
     /**
      * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 期区ID

src/main/java/com/huiju/estateagents/property/model/TpPhase.java

@@ -28,10 +28,7 @@ public class TpPhase implements Serializable {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
-    /**
-     * 小区ID
-     */
+
     private Integer orgId;
 
     /**
@@ -43,4 +40,9 @@ public class TpPhase implements Serializable {
      * 创建时间
      */
     private LocalDateTime createDate;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
 }

src/main/java/com/huiju/estateagents/property/model/TpRoomNo.java

@@ -28,11 +28,13 @@ public class TpRoomNo implements Serializable {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
+
+    private Integer orgId;
+
     /**
-     * 小区id
+     * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 期区ID

src/main/java/com/huiju/estateagents/property/model/TpTicket.java

@@ -33,10 +33,13 @@ public class TpTicket implements Serializable {
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+
+    private Integer orgId;
+
     /**
      * 小区id
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 住户app的id

src/main/java/com/huiju/estateagents/property/model/TpUnit.java

@@ -28,11 +28,13 @@ public class TpUnit implements Serializable {
     
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-    
+
+    private Integer orgId;
+
     /**
      * 小区ID
      */
-    private Integer orgId;
+    private Integer communityId;
 
     /**
      * 期区ID

src/main/java/com/huiju/estateagents/property/service/BuildingTreeServiceI.java

@@ -1,10 +1,13 @@
 package com.huiju.estateagents.property.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
+import com.huiju.estateagents.property.model.TpRoomNo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 public interface BuildingTreeServiceI {
 	
 	/**
@@ -17,10 +20,11 @@ public interface BuildingTreeServiceI {
 	/**
 	 * 上传小区的基础数据
 	 * @param file
+	 * @param communityId
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean submitExcelData(MultipartFile file, TaUser userElement);
+	ResponseBean submitExcelData(MultipartFile file, Integer communityId, TaUser userElement);
 	
 	/**
 	 * 获取树形数据
@@ -46,4 +50,10 @@ public interface BuildingTreeServiceI {
 	 * @return
 	 */
 	ResponseBean deleteNode(String parameter, Integer orgId);
+
+	IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
+
+	ResponseBean editNode(Map<String, Object> parameter, Integer orgId);
+
+    int getRoomNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/service/IBillService.java

@@ -3,11 +3,10 @@ package com.huiju.estateagents.property.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.Bill;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +27,7 @@ public interface IBillService extends IService<Bill> {
      * @param userElement
      * @return
      */
-    ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, String parameter);
+    ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, Bill bill);
 
     /**
      * 根据ID查询 缴费项
@@ -48,6 +47,7 @@ public interface IBillService extends IService<Bill> {
 
 	/**
 	 * 上传excel, 解析, 但不入库
+	 *
 	 * @param file
 	 * @return
 	 */
@@ -57,13 +57,12 @@ public interface IBillService extends IService<Bill> {
 	 * 上传excel, 解析 入库
 	 * @param billId
 	 * @param file
-	 * @param billExplain
 	 * @param billName
 	 * @param endDate
 	 * @param billStatus
 	 * @return
 	 */
-	ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, TaUser userElement);
+	ResponseBean saveExcelData(Integer billId, MultipartFile file, Integer communityId, String billName, LocalDateTime startDate, LocalDateTime endDate, String billStatus, TaUser userElement);
 
 	/**
 	 * 修改 缴费项状态
@@ -86,7 +85,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param userElement
 	 * @return
 	 */
-	ResponseBean downloadExcel(TaUser userElement);
+	ResponseBean downloadExcel(TaUser userElement, Integer communityId, String phaseId,String buildingId);
 
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据
@@ -119,4 +118,8 @@ public interface IBillService extends IService<Bill> {
 	 * @return
 	 */
 	ResponseBean getOrderInfo(String orderNumber);
+
+    int getBillHouse(Integer orgId, String startDate, String endDate);
+
+    List<Map<String, Object>> getBillMapList(Integer orgId, String startDate, String endDate);
 }

src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java

@@ -3,11 +3,11 @@ package com.huiju.estateagents.property.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -61,17 +61,19 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      *   楼栋是根据 小区ID查询
      *
      * @param orgId
+     * @param communityId
      * @return
      */
-    ResponseBean getPhaseList(Integer orgId);
+    ResponseBean getPhaseList(Integer orgId, Integer communityId);
     
     /**
      * 上传excel里面的内容
      * @param file
+     * @param communityId
      * @param userElement
      * @return
      */
-    ResponseBean submitExcelData(MultipartFile file, TaUser userElement);
+    ResponseBean submitExcelData(MultipartFile file, Integer communityId, TaUser userElement);
 
     /**
      * 认证用户是否停用
@@ -114,10 +116,12 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
 
     /**
      * 下载Excel模板(小区楼栋信息)
+     *
+     * @param communityId
      * @param userElement
      * @return
      */
-    ResponseBean downloadExcel(TaUser userElement);
+    ResponseBean downloadExcel(Integer communityId, TaUser userElement);
     
     /**
      * 获取楼栋信息
@@ -181,4 +185,8 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @return
      */
     ResponseBean hasBuild(String personId, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
+
+    int getAvailableProp(Integer orgId);
+
+    Map<String, Object> getVerifyNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/service/ITaUserCommunityService.java

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.property.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.property.entity.TaUserCommunity;
+import com.huiju.estateagents.property.entity.TpCommunity;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+public interface ITaUserCommunityService extends IService<TaUserCommunity> {
+
+    List<TpCommunity> getListBy(Integer orgId, Integer userId);
+
+    boolean addUserCommunity(Integer orgId, Integer userId, List<TpCommunity> communityList) throws Exception;
+}

src/main/java/com/huiju/estateagents/property/service/ITaUserVerifyService.java

@@ -6,6 +6,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.model.TaUserVerify;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,6 +16,8 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
 
     /**
      * 查询 所有审核数据
+     *
+     * @param communityId
      * @param phone
      * @param userName
      * @param idCard
@@ -23,7 +26,7 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      * @param userElement
      * @return
      */
-    ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement);
+    ResponseBean selectAll(Integer communityId, String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement);
 
     /**
      * 审核 用户
@@ -97,4 +100,7 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      */
     Page<Map<String, String>> getPropUserByBirday(Page<Map<String, String>> page, Integer orgId, String birthday);
 
+    List<Map<String, Object>> getVerifyMapList(Integer orgId, String startDate, String endDate);
+
+    int getNoVerifyNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/service/ITpCommunityService.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.property.service;
+
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+public interface ITpCommunityService extends IService<TpCommunity> {
+
+    List<TpCommunity> getAllByOrg(Integer orgId);
+}

src/main/java/com/huiju/estateagents/property/service/TpTicketService.java

@@ -5,8 +5,11 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.model.TpTicket;
 import com.huiju.estateagents.property.model.TpTicketRecordComment;
+import org.apache.ibatis.annotations.Param;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -67,7 +70,7 @@ public interface TpTicketService extends IService<TpTicket> {
      * @param id
      * @return
      */
-    ResponseBean updateTicketStatus(String parameter, Integer id, Integer orgId, String userNmae, String LoginName);
+    ResponseBean updateTicketStatus(String parameter, Integer id, Integer orgId, String userNmae, String phone);
 
     /**
      * 修改当前状态为待评价
@@ -77,7 +80,7 @@ public interface TpTicketService extends IService<TpTicket> {
      * @param userName
      * @return
      */
-    ResponseBean updateTicket(String parameter, Integer id, Integer orgId, String userName, String longName);
+    ResponseBean updateTicket(String parameter, Integer id, Integer orgId, String userName, String phone);
 
 
     /**
@@ -178,4 +181,10 @@ public interface TpTicketService extends IService<TpTicket> {
      * @return
      */
     ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId);
+
+    int getTicketNum(@Param("orgId") Integer orgId,@Param("startDate") String startDate,@Param("endDate") String endDate);
+
+    List<Map<String, Object>> getTicketMapList(Integer orgId, String startDate, String endDate);
+
+    int getStartNum(Integer orgId);
 }

src/main/java/com/huiju/estateagents/property/service/impl/BillInvoiceServiceImpl.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.exception.WisdomException;
@@ -120,7 +122,10 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         respMap.put("list", invoiceIPage.getRecords());
         respMap.put("billName", bill.getBillName());
         respMap.put("billExplain", bill.getBillExplain());
+        respMap.put("startDate", bill.getStartDate());
         respMap.put("endDate", bill.getEndDate());
+        respMap.put("communityId", bill.getCommunityId());
+
 
         responseBean.addSuccess(respMap);
 
@@ -262,6 +267,13 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         // 收费项ID
         Integer billId = jsonObject.getInteger("billId");
+        //
+        Integer communityId = jsonObject.getInteger("communityId");
+
+        if (null == billId || null == communityId) {
+            return ResponseBean.error("收费ID或者小区不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
         // 区/期
         Integer phase = jsonObject.getInteger("phaseId");
         // 栋
@@ -290,6 +302,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         // 校验 期/区/栋/单元/楼层/户号
         QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
         roomNoQueryWrapper.eq("org_id", userElement.getOrgId());
+        roomNoQueryWrapper.eq("community_id", communityId);
         roomNoQueryWrapper.eq("phase_id", phase);
         roomNoQueryWrapper.eq("building_id", building);
         roomNoQueryWrapper.eq("unit_id", unit);
@@ -386,7 +399,10 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         map.put("billId", billId);
         map.put("orgId", userElement.getOrgId());
 
+        Bill bill = billMapper.selectById(billId);
+
         List<BillInvoice> billInvoices = billInvoiceMapper.selectBillInvoiceTemp(map);
+        billInvoices.stream().forEach(e -> e.setCommunityId(bill.getCommunityId()));
 
         responseBean.addSuccess(billInvoices);
         return responseBean;
@@ -439,7 +455,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
     @Override
     public ResponseBean exportExcel(TaUser userElement, Integer billId) {
         ResponseBean responseBean = new ResponseBean();
-        String [] title = new String[] { "收费单号","房屋信息","收费单说明","金额(元)","流水","缴费状态","缴费人","缴费时间","新建时间","新建人","修改人","修改时间" };
+        String [] title = new String[] {"序号", "收费名称", "开始时间", "结束时间", "类别", "收费单号","期/区","楼栋","单元","房室","金额(元)","订单流水","缴费状态","缴费人","缴费时间" };
 
         HSSFWorkbook excel = excel(title, userElement, billId,null);
         responseBean.addSuccess(excel);
@@ -488,70 +504,109 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         IPage<BillInvoice> billInvoiceIPage = billInvoiceMapper.selectBillInvoiceEffective(page, map);
         List<BillInvoice> records = billInvoiceIPage.getRecords();
 
+        Bill bill = billMapper.selectById(billId);
+        if (null == bill) {
+            return workbook;
+        }
 
         // 写入内容
+        int line = 0;
         for (int i = 1; i<= billInvoiceIPage.getPages(); i++) {
             for (int t = 0; t<records.size(); t++) {
+                line ++;
+                BillInvoice billInvoice = records.get(t);
                 row = sheet.createRow(++rowNum);
-                // 收费单号
+
+                // 序号
                 cell = row.createCell(0);
-                cell.setCellValue(records.get(t).getId());
+                cell.setCellValue(line);
                 cell.setCellStyle(style);
-                // 房屋信息
+
+                // 收费名称
                 cell = row.createCell(1);
-                cell.setCellValue(records.get(t).getPhase() + records.get(t).getBuilding() + records.get(t).getUnit() + records.get(t).getRoomNo());
+                cell.setCellValue(StringUtils.ifNull(billInvoice.getBillInvoiceExplain(), bill.getBillName()));
                 cell.setCellStyle(style);
-                // 业主姓名
-//                cell = row.createCell(2);
-//                cell.setCellValue(records.get(t).getOwnerName());
-//                cell.setCellStyle(style);
-                // 收费单说明
+
+                // 开始时间
                 cell = row.createCell(2);
-                cell.setCellValue(records.get(t).getBillInvoiceExplain());
+                cell.setCellValue(DateUtils.format(bill.getStartDate(), "yyyy-MM-dd"));
                 cell.setCellStyle(style);
-                // 金额(元)
+
+                // 结束时间
                 cell = row.createCell(3);
-                double price = Double.valueOf(records.get(t).getPayPrice()) / 100.00;
-                cell.setCellValue(price);
+                cell.setCellValue(DateUtils.format(bill.getEndDate(), "yyyy-MM-dd"));
                 cell.setCellStyle(style);
-                if (null != records.get(t).getBillStatementId()) {
-                    // 流水
-                    cell = row.createCell(4);
-                    cell.setCellValue(records.get(t).getBillStatementId());
-                    cell.setCellStyle(style);
-                }
-                // 缴费状态
+
+                // 类别
+                cell = row.createCell(4);
+                cell.setCellValue(bill.getIsTicket() ? "维修" : "物业");
+                cell.setCellStyle(style);
+
+                // 收费单号
                 cell = row.createCell(5);
-                cell.setCellValue("0".equals(records.get(t).getBillStatus()) ? "未交费" : "1".equals(records.get(t).getBillStatus()) ? "已线上缴费" : "已线下缴费");
+                cell.setCellValue(billInvoice.getId());
                 cell.setCellStyle(style);
-                // 缴费人
+
+                // 房屋信息
                 cell = row.createCell(6);
-                cell.setCellValue(records.get(t).getPayName());
+                cell.setCellValue(billInvoice.getPhase());
                 cell.setCellStyle(style);
-                if (null != records.get(t).getPayDate()) {
-                    // 缴费时间
-                    cell = row.createCell(7);
-                    cell.setCellValue(dateFormat.format(records.get(t).getPayDate()));
-                    cell.setCellStyle(style);
-                }
-                // 新建时间
+
+                cell = row.createCell(7);
+                cell.setCellValue(billInvoice.getBuilding());
+                cell.setCellStyle(style);
+
                 cell = row.createCell(8);
-                cell.setCellValue(dateFormat.format(records.get(t).getCreateDate()));
+                cell.setCellValue(billInvoice.getUnit());
                 cell.setCellStyle(style);
-                // 新建人
+
                 cell = row.createCell(9);
-                cell.setCellValue(records.get(t).getCreateUserName());
+                cell.setCellValue(billInvoice.getRoomNo());
                 cell.setCellStyle(style);
-                // 修改人
+
+                // 金额(元)
                 cell = row.createCell(10);
-                cell.setCellValue(records.get(t).getUpdateUserName());
+                double price = Double.valueOf(billInvoice.getPayPrice()) / 100.00;
+                cell.setCellValue(price);
                 cell.setCellStyle(style);
-                if (null != records.get(t).getUpdateDate()) {
-                    // 修改时间
+                if (null != billInvoice.getBillStatementId()) {
+                    // 流水
                     cell = row.createCell(11);
-                    cell.setCellValue(dateFormat.format(records.get(t).getUpdateDate()));
+                    cell.setCellValue(billInvoice.getBillStatementId());
+                    cell.setCellStyle(style);
+                }
+                // 缴费状态
+                cell = row.createCell(12);
+                cell.setCellValue("0".equals(billInvoice.getBillStatus()) ? "未交费" : "1".equals(billInvoice.getBillStatus()) ? "已线上缴费" : "已线下缴费");
+                cell.setCellStyle(style);
+                // 缴费人
+                cell = row.createCell(13);
+                cell.setCellValue(billInvoice.getPayName());
+                cell.setCellStyle(style);
+                if (null != billInvoice.getPayDate()) {
+                    // 缴费时间
+                    cell = row.createCell(14);
+                    cell.setCellValue(dateFormat.format(billInvoice.getPayDate()));
                     cell.setCellStyle(style);
                 }
+//                // 新建时间
+//                cell = row.createCell(8);
+//                cell.setCellValue(dateFormat.format(billInvoice.getCreateDate()));
+//                cell.setCellStyle(style);
+//                // 新建人
+//                cell = row.createCell(9);
+//                cell.setCellValue(billInvoice.getCreateUserName());
+//                cell.setCellStyle(style);
+//                // 修改人
+//                cell = row.createCell(10);
+//                cell.setCellValue(billInvoice.getUpdateUserName());
+//                cell.setCellStyle(style);
+//                if (null != billInvoice.getUpdateDate()) {
+//                    // 修改时间
+//                    cell = row.createCell(11);
+//                    cell.setCellValue(dateFormat.format(billInvoice.getUpdateDate()));
+//                    cell.setCellStyle(style);
+//                }
             }
             page.setCurrent(i);
             page.setSize(500);

src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.property.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -38,7 +37,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -106,15 +104,20 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, String parameter) {
+    public ResponseBean updateBillNameAndBillExplainAndEndDate(TaUser userElement, Bill bill) {
         ResponseBean responseBean = new ResponseBean();
-        Bill bill = JSONObject.parseObject(parameter, Bill.class);
+//        Bill bill = JSONObject.parseObject(parameter, Bill.class);
         if (StringUtils.isEmpty(bill.getBillName())) {
             responseBean.addError("收费项名称不能为空");
             return responseBean;
         }
-        if (StringUtils.isEmpty(bill.getBillExplain())) {
-            responseBean.addError("缴费项说明");
+//        if (StringUtils.isEmpty(bill.getBillExplain())) {
+//            responseBean.addError("缴费项说明");
+//            return responseBean;
+//        }
+
+        if (bill.getStartDate() == null) {
+            responseBean.addError("截止时间不能为空");
             return responseBean;
         }
         if (bill.getEndDate() == null) {
@@ -187,26 +190,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean getExcelData(Integer billId, MultipartFile file, String billExplain, String billName, Date endDate, String billStatus, TaUser userElement) {
+    public ResponseBean saveExcelData(Integer billId, MultipartFile file, Integer communityId, String billName, LocalDateTime startDate, LocalDateTime endDate, String billStatus, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
-        // 获取本地时间
-        Date date = new Date();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String formatDate = simpleDateFormat.format(date);
-        Date parse = null;
-        try {
-            parse = simpleDateFormat.parse(formatDate);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-
-        if (endDate.getTime() < parse.getTime()) {
-            responseBean.addError("不能小于当前时间!");
-            return responseBean;
-        }
-
-
         List<BillInvoice> records = null;
         if (billId != null) {
             // 查询出这个收费单, 存在的缴费单数据
@@ -240,8 +226,10 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         // 存入缴费项表
         Bill bill = new Bill();
+        bill.setCommunityId(communityId);
         bill.setBillName(billName);
-        bill.setBillExplain(billExplain);
+//        bill.setBillExplain(billExplain);
+        bill.setStartDate(startDate);
         bill.setEndDate(endDate);
         if (StringUtils.isNotBlank(strSumDouble)) {
             strSumDouble = strSumDouble.substring(0, strSumDouble.lastIndexOf("."));
@@ -344,6 +332,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             List<BillInvoice> billInvoices = tempBills.stream().map(e -> {
                 BillInvoice billInvoice = new BillInvoice();
                 billInvoice.setOrgId(userElement.getOrgId());
+                billInvoice.setCommunityId(communityId);
                 billInvoice.setBillId(bill.getId());
 
                 /**
@@ -354,7 +343,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                     throw new WisdomException("房产：" + e.getPhase() + e.getBuilding() + e.getUnit() + e.getLevel() + e.getRoomNo() + " 不存在！请核对！");
                 }
                 billInvoice.setRoomNoId(tpRoomNo.getId());
-                billInvoice.setBillInvoiceExplain(e.getBillExplain());
+                billInvoice.setBillInvoiceExplain(billName);
                 billInvoice.setPayPrice(e.getPayPrice());
                 billInvoice.setBillStatus("0");
                 billInvoice.setCreateUser(userElement.getUserId());
@@ -472,17 +461,17 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             String roomNo = cell.getStringCellValue().trim();
 
 
-            // 收费说明可以为空
-            cell = getCell(row.getCell(6));
-            String billExplain = null;
-            if (null != cell) {
-                billExplain = cell.getStringCellValue().trim();
-                if (billExplain.length() > 100) {
-                    throw new WisdomException("第" + currentRow + "行 收费说明超出100字，请精简到100字以内");
-                }
-            }
+//            // 收费说明可以为空
+//            cell = getCell(row.getCell(6));
+//            String billExplain = null;
+//            if (null != cell) {
+//                billExplain = cell.getStringCellValue().trim();
+//                if (billExplain.length() > 100) {
+//                    throw new WisdomException("第" + currentRow + "行 收费说明超出100字，请精简到100字以内");
+//                }
+//            }
 
-            cell = getCell(row.getCell(7));
+            cell = getCell(row.getCell(6));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 金额 不能为空");
             }
@@ -496,7 +485,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             temp.setUnit(unit);
             temp.setRoomNo(roomNo);
             // temp.setOwnerName(ownerName);
-            temp.setBillExplain(billExplain);
+//            temp.setBillExplain(billExplain);
 
 
             if (StringUtils.isNotBlank(money)) {
@@ -608,7 +597,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     }
 
     @Override
-    public ResponseBean downloadExcel(TaUser userElement) {
+    public ResponseBean downloadExcel(TaUser userElement, Integer communityId, String phaseId,String buildingId) {
         ResponseBean responseBean = new ResponseBean();
 
         InputStream inputStream = null;
@@ -631,9 +620,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         Integer pageSize = 10;
         // 分页查询
 
-        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), pageNum * pageSize, pageSize);
+        List<TpRoomNo> records = tpRoomNoMapper.selectComunityList(userElement.getOrgId(), communityId, phaseId,buildingId,pageNum * pageSize, pageSize);
         // 总页数
-        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId());
+        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId(), communityId);
 
 
         // 行数 默认从 第 6 行开始
@@ -662,7 +651,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 if (index == records.size()) {
                     index = 0;
                     pageNum ++;
-                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), pageNum * pageSize, pageSize);
+                    records = tpRoomNoMapper.selectComunityList(userElement.getOrgId(), communityId, phaseId,buildingId, pageNum * pageSize, pageSize);
                 }
                 if (records.isEmpty()) {
                     break;
@@ -806,4 +795,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
         return responseBean;
     }
 
+    @Override
+    public int getBillHouse(Integer orgId, String startDate, String endDate) {
+        return tpBillOrderMapper.getBillHouse(orgId, startDate, endDate);
+    }
+
+    @Override
+    public List<Map<String, Object>> getBillMapList(Integer orgId, String startDate, String endDate) {
+        return tpBillOrderMapper.getBillMapList(orgId, startDate, endDate);
+    }
+
 }

src/main/java/com/huiju/estateagents/property/service/impl/BillStatementServiceImpl.java

@@ -52,6 +52,8 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
 
         Integer pageNum = jsonObject.getInteger("pageNum");
         Integer pageSize = jsonObject.getInteger("pageSize");
+        // 小区ID
+        Integer communityId = jsonObject.getInteger("communityId");
         // 订单号 orderBumber
         String orderBumber = jsonObject.getString("orderBumber");
         // 缴费项 id
@@ -62,15 +64,26 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
         Integer billInvoiceId = jsonObject.getInteger("billInvoiceId");
         // 缴费人手机号
         String payPhone = jsonObject.getString("payPhone");
+        // 订单状态
+        String orderStatus = jsonObject.getString("orderStatus");
+        // 缴费方式
+        String payType = jsonObject.getString("payType");
+        String startCreateDate = jsonObject.getString("startCreateDate");
+        String endCreateDate = jsonObject.getString("endCreateDate");
 
         // 参数
         Map<String, Object> map = Maps.newHashMap();
+        map.put("communityId", communityId);
         map.put("orderBumber", orderBumber);
         map.put("billId", billId);
         map.put("billName", billName);
         map.put("billInvoiceId", billInvoiceId);
         map.put("payPhone", payPhone);
         map.put("orgId", userElement.getOrgId());
+        map.put("orderStatus", orderStatus);
+        map.put("payType", payType);
+        map.put("startCreateDate", startCreateDate);
+        map.put("endCreateDate", endCreateDate);
 
         Page<TpBillOrder> page = new Page<>();
         page.setCurrent(pageNum);
@@ -99,7 +112,11 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
             // 总金额
             Long sumPrice = childBillOrderList.stream().mapToLong(billOrder -> {
                 BillInvoice billInvoice = billInvoiceMapper.selectById(billOrder.getTpBillInvoiceId());
-                return billInvoice.getPayPrice();
+                Integer payPrice = 0;
+                if (null != billInvoice){
+                    payPrice = billInvoice.getPayPrice();
+                }
+                return payPrice;
             }).sum();
 
             e.setBillIdList(billIdCollect);
@@ -164,7 +181,7 @@ public class BillStatementServiceImpl extends ServiceImpl<BillStatementMapper, B
 
         Page<BillStatement> page = new Page<>();
         page.setCurrent(1);
-        page.setSize(500);
+        page.setSize(9999);
         IPage<BillStatement> billInvoiceIPage = billStatementMapper.getBillStatementAll(page, map);
         List<BillStatement> records = billInvoiceIPage.getRecords();
 

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -13,8 +13,6 @@ import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
-import com.huiju.estateagents.property.common.UserElement;
-import com.huiju.estateagents.property.common.base.messagePush;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.exception.WisdomException;
 import com.huiju.estateagents.property.model.*;
@@ -24,13 +22,11 @@ import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -115,6 +111,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setOrgId(userElement.getOrgId());
         Long pageNum = jsonObject.getLong("pageNum") == null ? 1 : jsonObject.getLong("pageNum");
         Long pageSize = jsonObject.getLong("pageSize") == null ? 10 : jsonObject.getLong("pageSize");
+        tpBuildingOwnerInfo.setVerifyStatus(jsonObject.getString("verifyStatus"));
 
         Page page = new Page(pageNum,pageSize);
 
@@ -129,6 +126,11 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 }
             }
 
+            TaUser taUser = taUserMapper.selectById(e.getUpdateName());
+            if (null != taUser){
+                e.setUpdateName(taUser.getUserName());
+            }
+
         });
 
         Map<String, Object> retMap = Maps.newHashMap();
@@ -182,13 +184,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         taUserVerifyMapper.updateById(userVerify);
 
         // app 用户信息
-        TaPerson person = taPersonMapper.selectById(userVerify.getPersonId());
+//        TaPerson person = taPersonMapper.selectById(userVerify.getPersonId());
 
 //         审核通过后，往楼栋资料库添加数据
         if ("1".equals(verify)) {
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(userVerify.getCommunityId(), userVerify.getPhaseId(), userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId(), userElement.getOrgId(), userElement.getUserId(),
-                    userVerify.getGender(), person.getNickname(), person.getPhone());
+                    userVerify.getGender(), userVerify.getOwnerName(), userVerify.getPhone(), userVerify.getIdCard());
 
             // 设置审核id
             tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
@@ -251,9 +253,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 //        tpBuildingOwnerInfo.setOwnerName(appUser.getUserName());
 
         // 插入楼栋资料库
-        tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
+        tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getCommunityId(), tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
                 tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId(), userElement.getOrgId(), userElement.getUserId(),
-                tpBuildingOwnerInfo.getGender(), tpBuildingOwnerInfo.getOwnerName(), tpBuildingOwnerInfo.getOwnerTel());
+                tpBuildingOwnerInfo.getGender(), tpBuildingOwnerInfo.getOwnerName(), tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getIdCard());
 
         // 更新 APP 端用户姓名
 //        appUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
@@ -345,6 +347,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
     /**
      * 插入 楼栋资料库
+     * @param communityId
      * @param phaseId
      * @param buildingId
      * @param unitId
@@ -356,9 +359,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * @param ownerName
      * @param ownerTel
      */
-    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo (Integer phaseId, Integer buildingId, Integer unitId,
-                                                           Integer levelId, Integer roomNoId, Integer orgId,
-                                                           Integer userId, String gender, String ownerName, String ownerTel) {
+    private TpBuildingOwnerInfo insertTpBuildingOwnerInfo(Integer communityId, Integer phaseId, Integer buildingId, Integer unitId,
+                                                          Integer levelId, Integer roomNoId, Integer orgId,
+                                                          Integer userId, String gender, String ownerName, String ownerTel, String idCard) {
         TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
 
         // 查询 期/楼栋/单元/层/户号
@@ -370,6 +373,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 主键是自增的, 所以设置为 null
         tpBuildingOwnerInfo.setId(null);
+        tpBuildingOwnerInfo.setCommunityId(communityId);
         tpBuildingOwnerInfo.setPhaseId(phaseId);
         tpBuildingOwnerInfo.setPhaseName(phase.getName());
         tpBuildingOwnerInfo.setBuildingId(buildingId);
@@ -382,6 +386,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setRoomNoName(roomNo.getName());
         tpBuildingOwnerInfo.setOwnerName(ownerName);
         tpBuildingOwnerInfo.setOwnerTel(ownerTel);
+        tpBuildingOwnerInfo.setIdCard(idCard);
         tpBuildingOwnerInfo.setGender(gender);
         tpBuildingOwnerInfo.setUpdateUser(userId);
         tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
@@ -389,8 +394,6 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setCreateUser(userId);
         tpBuildingOwnerInfo.setVerifyStatus("0");
         tpBuildingOwnerInfo.setPairStatus("0");
-
-        // 添加的时候, 默认是当前操作的小区
         tpBuildingOwnerInfo.setOrgId(orgId);
 
         int row = tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
@@ -419,7 +422,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
 
     @Override
-    public ResponseBean getPhaseList(Integer orgId) {
+    public ResponseBean getPhaseList(Integer orgId, Integer communityId) {
 
         ResponseBean responseBean = new ResponseBean();
         if (null == orgId || "".equals(orgId)) {
@@ -429,6 +432,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Map<String, Object> map = Maps.newHashMap();
         // 小区
         map.put("org_id", orgId);
+        map.put("community_id", communityId);
         QueryWrapper<TpPhase> queryWrapper = new QueryWrapper<>();
         queryWrapper.allEq(map, false);
     
@@ -442,12 +446,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
      * 上传excel里面的内容
      *
      * @param file
+     * @param communityId
      * @param userElement
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean submitExcelData(MultipartFile file, TaUser userElement) {
+    public ResponseBean submitExcelData(MultipartFile file, Integer communityId, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = getExcelData(file);
 
@@ -464,6 +469,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             e.setOrgId(userElement.getOrgId());
             e.setVerifyStatus("0");
             e.setPairStatus("0");
+            e.setCommunityId(communityId);
             e.setCreateUser(userElement.getUserId());
             e.setCreateDate(LocalDateTime.now());
         });
@@ -685,9 +691,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 cell = row.getCell(3);
                 cell.setCellType(Cell.CELL_TYPE_STRING);
                 String ownerTel = cell.getStringCellValue().trim();
-                cell = row.getCell(4);
-                cell.setCellType(Cell.CELL_TYPE_STRING);
-                String ownerRole = cell.getStringCellValue().trim();
+//                cell = row.getCell(4);
+//                cell.setCellType(Cell.CELL_TYPE_STRING);
+//                String ownerRole = cell.getStringCellValue().trim();
                 int currentRow = j+1;
                 if (StringUtils.isEmpty(buildingInfo)){
                     responseBean.addError("第" + currentRow + "行" + "房产信息不能为空!");
@@ -712,10 +718,10 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                     return responseBean;
                 }
 
-                if (StringUtils.isEmpty(ownerRole)){
-                    responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
-                    return responseBean;
-                }
+//                if (StringUtils.isEmpty(ownerRole)){
+//                    responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
+//                    return responseBean;
+//                }
                 LambdaQueryWrapper<TpBuildingOwnerInfo> ownerInfoQueryWrapper = new LambdaQueryWrapper<>();
                 ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getOwnerTel,ownerTel);
                 ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getRoomNoId,roomNoId);
@@ -736,7 +742,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 //构建数据
                 TpBuildingOwnerInfo checkOwnerInfo = new TpBuildingOwnerInfo();
                 checkOwnerInfo.setId(null);
-                checkOwnerInfo.setRoleName(ownerRole);
+//                checkOwnerInfo.setRoleName(ownerRole);
                 checkOwnerInfo.setOwnerName(ownerName);
                 checkOwnerInfo.setOwnerTel(ownerTel);
                 checkOwnerInfo.setPhaseId(tpRoomNo.getPhaseId());
@@ -976,7 +982,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public ResponseBean downloadExcel(TaUser userElement) {
+    public ResponseBean downloadExcel(Integer communityId, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         InputStream inputStream = null;
@@ -999,9 +1005,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Integer pageSize = 10;
 
         // 分页查询
-        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(),pageNum * pageSize, pageSize);
+        List<TpRoomNo> records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), communityId,pageNum * pageSize, pageSize);
         // 总页数
-        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId());
+        Long pages = tpRoomNoMapper.selectCommunityIdCount(userElement.getOrgId(), communityId);
 
 
         // 行数 默认从 第 3 行开始
@@ -1050,7 +1056,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 if (index == records.size()) {
                     index = 0;
                     pageNum ++;
-                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(),pageNum * pageSize, pageSize);
+                    records = tpRoomNoMapper.selectCommunityIdList(userElement.getOrgId(), communityId, pageNum * pageSize, pageSize);
                 }
                 if (records.isEmpty()) {
                     break;
@@ -1233,8 +1239,9 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     @Override
     public ResponseBean hasBuild(String personId, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
         ResponseBean responseBean = new ResponseBean();
+        TaPerson taPerson = taPersonMapper.selectById(personId);
         // 1.检验该用户关联有没有这个 户号，审核通过的
-        List<TaUserVerify> taUserVerifyEqVerifyStatus1 = taUserVerifyMapper.selectWxCommunityAndAddress(personId,1, phaseId, buildingId, unitId, levelId, roomNoId, 1);
+        List<TaUserVerify> taUserVerifyEqVerifyStatus1 = taUserVerifyMapper.selectWxCommunityAndAddress(personId,taPerson.getOrgId(), phaseId, buildingId, unitId, levelId, roomNoId, 1);
         // List<TaUserVerify> taUserVerify = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(userElement.getId(),userElement.getCommunityId(), phaseId, buildingId, unitId, levelId, roomNoId);
         if (null != taUserVerifyEqVerifyStatus1 && taUserVerifyEqVerifyStatus1.size() > 0) {
             responseBean.addError("你已关联此房间，无法再次关联！");
@@ -1242,7 +1249,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         }
 
         // 1.检验该用户关联有没有这个 户号，待审核
-        List<TaUserVerify> taUserVerifyEqVerifyStatus0 = taUserVerifyMapper.selectWxCommunityAndAddress(personId,1, phaseId, buildingId, unitId, levelId, roomNoId, 0);
+        List<TaUserVerify> taUserVerifyEqVerifyStatus0 = taUserVerifyMapper.selectWxCommunityAndAddress(personId,taPerson.getOrgId(), phaseId, buildingId, unitId, levelId, roomNoId, 0);
         if (null != taUserVerifyEqVerifyStatus0 && taUserVerifyEqVerifyStatus0.size() > 0) {
             responseBean.addError("您已提交了这个房产的审核！请等待户主或者物业审核后，再进行下一步操作！");
             return responseBean;
@@ -1266,4 +1273,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         responseBean.addSuccess(result);
         return responseBean;
     }
+
+    @Override
+    public int getAvailableProp(Integer orgId) {
+        return tpBuildingOwnerInfoMapper.getAvailableProp(orgId);
+    }
+
+    @Override
+    public Map<String, Object> getVerifyNum(Integer orgId) {
+        return tpBuildingOwnerInfoMapper.getVerifyNum(orgId);
+    }
 }

src/main/java/com/huiju/estateagents/property/service/impl/BuildingTreeServiceImpl.java

@@ -2,18 +2,16 @@ package com.huiju.estateagents.property.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.common.Constant;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.BuildingTreeServiceI;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -100,13 +98,24 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			for (int j = 3; j <= lastRowNum; j++) {
 				Row row = sheet.getRow(j);
 				TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-				String phase = row.getCell(0).getStringCellValue().trim();
-				String building = row.getCell(1).getStringCellValue().trim();
-				String unit = row.getCell(2).getStringCellValue().trim();
-				String level = row.getCell(3).getStringCellValue().trim();
-				String roomNo = row.getCell(4).getStringCellValue().trim();
-				
+				String phase = null;
+				String building = null;
+				String unit = null;
+				String level = null;
+				String roomNo = null;
 				int currentRow = j+1;
+				try {
+					phase = getStringOfCell(row.getCell(0));
+					building = getStringOfCell(row.getCell(1));
+					unit = getStringOfCell(row.getCell(2));
+					level = getStringOfCell(row.getCell(3));
+					roomNo = getStringOfCell(row.getCell(4));
+				} catch (Exception e) {
+					e.printStackTrace();
+					responseBean.addError(String.format("第 %d 行, 格式错误, 数据只能为字符或数字格式", currentRow));
+					return responseBean;
+				}
+
 				if (StringUtils.isEmpty(phase)){
 					responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
 					return responseBean;
@@ -154,16 +163,28 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		responseBean.addSuccess(data);
 		return responseBean;
 	}
+
+	private String getStringOfCell(Cell cell) throws Exception {
+		CellType cellTypeEnum = cell.getCellTypeEnum();
+		if (cellTypeEnum.equals(CellType.STRING)) {
+			return cell.getStringCellValue().trim();
+		} else if (cellTypeEnum.equals(CellType.NUMERIC)) {
+			return String.valueOf((int) cell.getNumericCellValue()).trim();
+		} else {
+			throw new Exception("数据内容格式错误");
+		}
+	}
 	
 	/**
 	 * 上传小区的基础数据
 	 *
 	 * @param file
+	 * @param communityId
 	 * @param userElement
 	 * @return
 	 */
 	@Override
-	public ResponseBean submitExcelData(MultipartFile file, TaUser userElement) {
+	public ResponseBean submitExcelData(MultipartFile file, Integer communityId, TaUser userElement) {
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = getExcelData(file);
 //		if (!responseBean.getCode().equals(Constant.RESPONSE_SUCCESS)){
@@ -177,7 +198,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		Integer orgId = userElement.getOrgId();
 		
 		//保存数据到表中--拆分数据
-		saveBuildingTreeData(orgId,list);
+		saveBuildingTreeData(orgId, communityId, list);
 		responseBean.addSuccess("success");
 		return responseBean;
 	}
@@ -275,6 +296,8 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		 String type= object.getString("type");
 		 //当前输入的节点内容
 		 String nodeNumber= object.getString("nodeNumber");
+		 // 小区
+		Integer communityId = object.getInteger("communityId");
 
 		/*查询出期*/
 		if(type.equals("phase")) {
@@ -290,8 +313,10 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			TpPhase tpPhase= new TpPhase();
 					tpPhase.setOrgId(orgId);
 					tpPhase.setName(nodeNumber);
+					tpPhase.setCommunityId(communityId);
 					tpPhase.setCreateDate(LocalDateTime.now());
 					tpPhaseMapper.insert(tpPhase);
+			return ResponseBean.success(tpPhase);
 		}
 		TpPhase	tpPhase= tpPhaseMapper.selectById(id);
 		if(type.equals("building")){
@@ -311,8 +336,10 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						 .setPhaseId(tpPhase.getId())
 						 .setPhaseName(tpPhase.getName())
 						 .setName(nodeNumber)
+							.setCommunityId(communityId)
 						 .setCreateDate(LocalDateTime.now());
 			tpBuildingMapper.insert(tpBuilding);
+			return ResponseBean.success(tpBuilding);
 		}
 		//查询栋，维护单元
 		 TpBuilding selectTpBuilding= tpBuildingMapper.selectById(id);
@@ -335,8 +362,10 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 						.setBuildingName(selectTpBuilding.getName())
 						.setBuildingId(selectTpBuilding.getId())
 						.setName(nodeNumber)
+						.setCommunityId(communityId)
 						.setCreateDate(LocalDateTime.now());
 		 	 tpUnitMapper.insert(tpUnit);
+			return ResponseBean.success(tpUnit);
 		 }
 
 		//查询单元，维护楼层
@@ -364,8 +393,10 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				.setUnitId(selectTpUnit.getId())
 				.setUnitName(selectTpUnit.getName())
 				.setName(nodeNumber)
+				.setCommunityId(communityId)
 				.setCreateDate(LocalDateTime.now());
 			 tpLevelMapper.insert(tpLevel);
+			return ResponseBean.success(tpLevel);
 			}
 		 //房间号
 	 	TpLevel selectTpLevel= tpLevelMapper.selectById(id);
@@ -392,8 +423,10 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 							.setLevelId(selectTpLevel.getId())
 							.setLevelName(selectTpLevel.getName())
 							.setName(nodeNumber)
+					.setCommunityId(communityId)
 							.setCreateDate(LocalDateTime.now());
 			tpRoomNoMapper.insert(tpRoomNo);
+			return ResponseBean.success(tpRoomNo);
 		}
 		responseBean.addSuccess("成功");
 		return responseBean;
@@ -497,10 +530,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
 						}
 				}
+
+					//删除所有楼层
+					tpLevelMapper.delete(tpLevel);
 			  }
 			}
-			//删除所有楼层
-			tpLevelMapper.delete(tpLevel);
 			//删除此单元
 			tpUnitMapper.delete(tpUnit);
 			//删除栋
@@ -515,47 +549,46 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 			building.eq("name", phase.getName());
 			List<TpBuilding> tpBuildingList= tpBuildingMapper.selectList(building);
 			for (TpBuilding tpBuilding:tpBuildingList){
-			//删除单元-楼层-房间
-			QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
-			List<TpUnit> unitList=null;
-			if (null!=tpBuilding) {
+				//删除单元-楼层-房间
+				QueryWrapper<TpUnit> tpUnit = new QueryWrapper<>();
 				tpUnit.eq("org_id", tpBuilding.getOrgId());
 				tpUnit.eq("phase_id", tpBuilding.getPhaseId());
 				tpUnit.eq("building_id", tpBuilding.getId());
 				tpUnit.eq("building_name", tpBuilding.getName());
-				unitList= tpUnitMapper.selectList(tpUnit);
-			}
-			//先查询楼层
-			QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
-			if (null!=unitList) {
-				for (TpUnit unit : unitList) {
-					tpLevel.eq("phase_id", unit.getPhaseId());
-					tpLevel.eq("org_id", unit.getOrgId());
-					tpLevel.eq("building_id", unit.getBuildingId());
-					tpLevel.eq("unit_id", unit.getId());
-					tpLevel.eq("unit_name", unit.getName());
-					//查询房间
-					List<TpLevel> levelList = tpLevelMapper.selectList(tpLevel);
-					if (null != levelList) {
-						for (TpLevel level : levelList) {
-							QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
-							tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
-							tpRoomNoQueryWrapper.eq("org_id", level.getOrgId());
-							tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
-							tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
-							tpRoomNoQueryWrapper.eq("level_id", level.getId());
-							tpRoomNoQueryWrapper.eq("level_name", level.getName());
-							//先删除所有房间
-							tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
+
+				List<TpUnit> unitList = tpUnitMapper.selectList(tpUnit);
+
+				//先查询楼层
+				QueryWrapper<TpLevel> tpLevel = new QueryWrapper<>();
+				if (null!=unitList) {
+					for (TpUnit unit : unitList) {
+						tpLevel.eq("phase_id", unit.getPhaseId());
+						tpLevel.eq("org_id", unit.getOrgId());
+						tpLevel.eq("building_id", unit.getBuildingId());
+						tpLevel.eq("unit_id", unit.getId());
+						tpLevel.eq("unit_name", unit.getName());
+						//查询房间
+						List<TpLevel> levelList = tpLevelMapper.selectList(tpLevel);
+						if (null != levelList) {
+							for (TpLevel level : levelList) {
+								QueryWrapper<TpRoomNo> tpRoomNoQueryWrapper = new QueryWrapper<>();
+								tpRoomNoQueryWrapper.eq("phase_id", level.getPhaseId());
+								tpRoomNoQueryWrapper.eq("org_id", level.getOrgId());
+								tpRoomNoQueryWrapper.eq("building_id", level.getBuildingId());
+								tpRoomNoQueryWrapper.eq("unit_id", level.getUnitId());
+								tpRoomNoQueryWrapper.eq("level_id", level.getId());
+								tpRoomNoQueryWrapper.eq("level_name", level.getName());
+								//先删除所有房间
+								tpRoomNoMapper.delete(tpRoomNoQueryWrapper);
+							}
 						}
+						//再删除所有楼层
+						tpLevelMapper.delete(tpLevel);
 					}
-					//再删除所有楼层
-					tpLevelMapper.delete(tpLevel);
 				}
+				//删除此单元
+				tpUnitMapper.delete(tpUnit);
 			}
-			//删除此单元
-			tpUnitMapper.delete(tpUnit);
-	}
 			//删除栋
 			tpBuildingMapper.delete(building);
 			//删除整个期
@@ -565,7 +598,74 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 		return responseBean;
 	}
 
-	private void saveBuildingTreeData(Integer orgId, List<TpBuildingOwnerInfo> list) {
+	@Override
+	public IPage<TpRoomNo> getRoomList(IPage<TpRoomNo> page, Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId) {
+		return tpRoomNoMapper.getRoomList(page, orgId, phaseId, buildingId, unitId, levelId, roomNoId);
+	}
+
+	@Override
+	public ResponseBean editNode(Map<String, Object> parameter, Integer orgId) {
+		if (null == parameter) {
+			return ResponseBean.error("编辑内容不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+		}
+
+		Integer id = (Integer) parameter.get("id");
+		String type = (String) parameter.get("type");
+		String name = (String) parameter.get("name");
+
+		if (null == id || StringUtils.isEmpty(type) || StringUtils.isEmpty(name)) {
+			return ResponseBean.error("部分编辑内容不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+		}
+
+		// 如果是期数
+		if ("phase".equals(type)) {
+			tpPhaseMapper.updateName(orgId, id, name);
+			tpBuildingMapper.updatePhaseName(orgId, id, name);
+			tpUnitMapper.updatePhaseName(orgId, id, name);
+			tpLevelMapper.updatePhaseName(orgId, id, name);
+			tpRoomNoMapper.updatePhaseName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		// 如果是楼栋
+		if ("building".equals(type)) {
+			tpBuildingMapper.updateName(orgId, id, name);
+			tpUnitMapper.updateBuildingName(orgId, id, name);
+			tpLevelMapper.updateBuildingName(orgId, id, name);
+			tpRoomNoMapper.updateBuildingName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		// 如果是单元
+		if ("unit".equals(type)) {
+			tpUnitMapper.updateName(orgId, id, name);
+			tpLevelMapper.updateUnitName(orgId, id, name);
+			tpRoomNoMapper.updateUnitName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		// 如果是楼层
+		if ("level".equals(type)) {
+			tpLevelMapper.updateName(orgId, id, name);
+			tpRoomNoMapper.updateLevelName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		// 如果是房间
+		if ("roomNo".equals(type)) {
+			tpRoomNoMapper.updateName(orgId, id, name);
+			return ResponseBean.success("success");
+		}
+
+		return ResponseBean.error("数据类型不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+	}
+
+	@Override
+	public int getRoomNum(Integer orgId) {
+		return tpRoomNoMapper.getRoomNum(orgId);
+	}
+
+	private void saveBuildingTreeData(Integer orgId, Integer communityId, List<TpBuildingOwnerInfo> list) {
 		String lastPhaseName = "";
 		String lastBuildingName = "";
 		String lastUnitName = "";
@@ -583,9 +683,11 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpPhase.setName(tpBuildingOwnerInfo.getPhaseName());
 				tpPhase.setOrgId(orgId);
 				tpPhase.setCreateDate(LocalDateTime.now());
+			tpPhase.setCommunityId(communityId);
 
 				QueryWrapper<TpPhase> phaseQueryWrapper = new QueryWrapper<>();
 				phaseQueryWrapper.eq("org_id", orgId);
+			phaseQueryWrapper.eq("community_id", communityId);
 				phaseQueryWrapper.eq("`NAME`", tpBuildingOwnerInfo.getPhaseName());
 				TpPhase selectPhase = tpPhaseMapper.selectOne(phaseQueryWrapper);
 				// 判断是否存在库里
@@ -609,6 +711,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpBuilding.setPhaseName(lastPhaseName);
 				tpBuilding.setName(tpBuildingOwnerInfo.getBuildingName());
 				tpBuilding.setCreateDate(LocalDateTime.now());
+				tpBuilding.setCommunityId(communityId);
 
 				QueryWrapper<TpBuilding> buildingQueryWrapper = new QueryWrapper<>();
 				buildingQueryWrapper.eq("org_id", orgId);
@@ -633,6 +736,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpUnit.setBuildingName(lastBuildingName);
 				tpUnit.setName(tpBuildingOwnerInfo.getUnitName());
 				tpUnit.setCreateDate(LocalDateTime.now());
+				tpUnit.setCommunityId(communityId);
 
 				QueryWrapper<TpUnit> unitQueryWrapper = new QueryWrapper<>();
 				unitQueryWrapper.eq("org_id", orgId);
@@ -662,6 +766,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpLevel.setUnitName(lastUnitName);
 				tpLevel.setName(tpBuildingOwnerInfo.getLevelName());
 				tpLevel.setCreateDate(LocalDateTime.now());
+				tpLevel.setCommunityId(communityId);
 
 				QueryWrapper<TpLevel> levelQueryWrapper = new QueryWrapper<>();
 				levelQueryWrapper.eq("org_id", orgId);
@@ -693,6 +798,7 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 				tpRoomNo.setLevelName(lastLevelName);
 				tpRoomNo.setName(tpBuildingOwnerInfo.getRoomNoName());
 				tpRoomNo.setCreateDate(LocalDateTime.now());
+				tpRoomNo.setCommunityId(communityId);
 
 				QueryWrapper<TpRoomNo> roomNoQueryWrapper = new QueryWrapper<>();
 				roomNoQueryWrapper.eq("org_id", orgId);

src/main/java/com/huiju/estateagents/property/service/impl/TaUserCommunityServiceImpl.java

@@ -0,0 +1,63 @@
+package com.huiju.estateagents.property.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.property.entity.TaUserCommunity;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.huiju.estateagents.property.mapper.TaUserCommunityMapper;
+import com.huiju.estateagents.property.mapper.TpCommunityMapper;
+import com.huiju.estateagents.property.service.ITaUserCommunityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Service
+public class TaUserCommunityServiceImpl extends ServiceImpl<TaUserCommunityMapper, TaUserCommunity> implements ITaUserCommunityService {
+
+    @Autowired
+    TaUserCommunityMapper taUserCommunityMapper;
+
+    @Autowired
+    TpCommunityMapper tpCommunityMapper;
+
+    @Override
+    public List<TpCommunity> getListBy(Integer orgId, Integer userId) {
+        return tpCommunityMapper.getListOfUser(orgId, userId);
+    }
+
+    @Override
+    public boolean addUserCommunity(Integer orgId, Integer userId, List<TpCommunity> communityList) throws Exception {
+        if (null == orgId || null == userId || null == communityList) {
+            throw new Exception("未找到授权小区需要操作的记录");
+        }
+
+        // 先删除原有授权记录
+        QueryWrapper<TaUserCommunity> deleteQuery = new QueryWrapper<>();
+        deleteQuery.eq("org_id", orgId);
+        deleteQuery.eq("user_id", userId);
+        remove(deleteQuery);
+
+        // 新增记录
+        List<TaUserCommunity> list = new ArrayList<>();
+        for (TpCommunity community: communityList) {
+            TaUserCommunity userCommunity = new TaUserCommunity();
+            userCommunity.setOrgId(orgId);
+            userCommunity.setUserId(userId);
+            userCommunity.setCommunityId(community.getId());
+            list.add(userCommunity);
+        }
+
+        return saveBatch(list);
+    }
+}

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -12,7 +12,6 @@ import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
-import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.common.base.messagePush;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.exception.WisdomException;
@@ -20,15 +19,12 @@ import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -78,14 +74,14 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     private ApplicationContext applicationContext;
 
     @Override
-    public ResponseBean selectAll(String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement) {
+    public ResponseBean selectAll(Integer communityId, String phone, String userName, String idCard, Integer pageNum, Integer pageSize, TaUser userElement) {
         ResponseBean responseBean = new ResponseBean();
 
         Page<TaUserVerify> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
 
-        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, phone, userName, idCard, userElement.getOrgId());
+        IPage<TaUserVerify> userVerifyIPage = taUserVerifyMapper.selectAllByPhoneAndUserNameAndIdCard(page, communityId, phone, userName, idCard, userElement.getOrgId());
         responseBean.addSuccess(userVerifyIPage);
 
         return responseBean;
@@ -111,7 +107,10 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         userVerify.setVerifyStatus(status);
 
         // 校验房产
-        hasUserVerify(userElement, userVerify, true);
+//        hasUserVerify(userElement, userVerify, true);
+        // 2020年12月31日 yansen
+        hasUserVerify(userElement, userVerify, Integer.valueOf(1).equals(userVerify.getRoleId()));
+
 
         TaUser user = taUserMapper.selectById(userElement.getUserId());
 
@@ -248,7 +247,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         userVerify.setVerifyStatus(verifyStatus);
 
         //判断审核数据是否冲突
-        hasUserVerify(userElement,  userVerify,  true);
+//        hasUserVerify(userElement,  userVerify,  true);
+        // 2020年12月31日 yansen
+        hasUserVerify(userElement,  userVerify,  Integer.valueOf(1).equals(userVerify.getRoleId()));
 
         // 被审核的用户
         TaPerson taPerson = taPersonMapper.selectById(userVerify.getPersonId());
@@ -335,14 +336,15 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             return responseBean;
         }
 
-        // 校验是否有审核通过的业主
-        TaUserVerify hasUserVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
-        if (null != hasUserVerify) {
-            responseBean.addError("此房产已存在户主!");
-            return responseBean;
+        if (Constant.OWNER.equals(roleName)){
+            // 校验是否有审核通过的业主
+            TaUserVerify hasUserVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
+            if (null != hasUserVerify) {
+                responseBean.addError("此房产已存在户主!");
+                return responseBean;
+            }
         }
 
-
         // 校验该用户是否已经提交了一个当前房产的审核, 包含 待审核和已审核通过
         List<TaUserVerify> userVerifyList = taUserVerifyMapper.selectCommunityAndAddressAndNotVerifyStatus2(taUserVerify.getPersonId(), taUserVerify.getOrgId(),
                 taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(),
@@ -494,4 +496,14 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     public Page<Map<String, String>> getPropUserByBirday(Page<Map<String, String>> page, Integer orgId, String birthday) {
         return taUserVerifyMapper.getPropUserByBirday(page, orgId, birthday);
     }
+
+    @Override
+    public List<Map<String, Object>> getVerifyMapList(Integer orgId, String startDate, String endDate) {
+        return taUserVerifyMapper.getVerifyMapList(orgId, startDate, endDate);
+    }
+
+    @Override
+    public int getNoVerifyNum(Integer orgId) {
+        return taUserVerifyMapper.getNoVerifyNum(orgId);
+    }
 }

src/main/java/com/huiju/estateagents/property/service/impl/TpAnnouncementServiceImpl.java

@@ -65,6 +65,7 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
         Integer announcementNumber = jsonobject.getInteger("announcementNumber");
         Integer pageSize = jsonobject.getInteger("pageSize");
         String announcementTitle = jsonobject.getString("announcementTitle");
+
         tpAnnouncement.setId(announcementNumber);
         if (!StringUtils.isEmpty(announcementTitle)) {
             tpAnnouncement.setAnnouncementTitle(announcementTitle);
@@ -74,6 +75,10 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
             tpAnnouncement.setAnnType(annType);
         }
 
+        tpAnnouncement.setStatus(jsonobject.getString("status"));
+        tpAnnouncement.setStartCreateDate(jsonobject.getString("startCreateDate"));
+        tpAnnouncement.setEndCreateDate(jsonobject.getString("endCreateDate"));
+
         // 分页
         Page<TpBuildingOwnerInfo> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);

src/main/java/com/huiju/estateagents/property/service/impl/TpCommunityServiceImpl.java

@@ -0,0 +1,32 @@
+package com.huiju.estateagents.property.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.property.entity.TpCommunity;
+import com.huiju.estateagents.property.mapper.TpCommunityMapper;
+import com.huiju.estateagents.property.service.ITpCommunityService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-01-19
+ */
+@Service
+public class TpCommunityServiceImpl extends ServiceImpl<TpCommunityMapper, TpCommunity> implements ITpCommunityService {
+
+    @Override
+    public List<TpCommunity> getAllByOrg(Integer orgId) {
+        QueryWrapper<TpCommunity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+
+        return list(queryWrapper);
+    }
+}

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -11,7 +11,13 @@ import com.google.common.collect.Maps;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaMpTemplate;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.dao.*;
@@ -21,11 +27,27 @@ import com.huiju.estateagents.property.mapper.TpRepairTypeMapper;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.TpTicketService;
 import com.huiju.estateagents.property.vo.TpTicketVO;
+import com.huiju.estateagents.redpack.entity.TaMpMiniapp;
+import com.huiju.estateagents.redpack.entity.TaMpPerson;
+import com.huiju.estateagents.redpack.mapper.TaMpMiniappMapper;
+import com.huiju.estateagents.redpack.mapper.TaMpPersonMapper;
+import com.huiju.estateagents.redpack.service.ITaMpPersonService;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ISysSmsEventService;
+import com.huiju.estateagents.service.ITaMpTemplateService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.third.entity.TaMpInfo;
+import com.huiju.estateagents.third.service.ITaMpInfoService;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,6 +55,7 @@ import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 
 /**
@@ -83,6 +106,33 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     @Autowired
     private ISysSmsEventService sysSmsEventService;
 
+    @Autowired
+    ITaMpInfoService iTaMpInfoService;
+
+    @Autowired
+    ITaMpPersonService iTaMpPersonService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @Autowired
+    private IMiniAppService iMiniAppService;
+
+    @Autowired
+    private ITaMpTemplateService iTaMpTemplateService;
+
+    @Autowired
+    WxUtils wxUtils;
+
+    @Value("${wx.miniapp.ticket}")
+    String miniAppTicket;
+
+    @Autowired
+    private TaMpMiniappMapper taMpMiniappMapper;
+
+    @Autowired
+    private TaMpPersonMapper taMpPersonMapper;
+
     @Override
     public ResponseBean ticketLiset(String parameter,Integer orgId) {
          ResponseBean response= new ResponseBean<>();
@@ -118,6 +168,16 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
             TaPerson person =taPersonMapper.selectById(tpTicket.getCreateUser());
             tpTicketVO.setCreateUserNmae(StringUtils.isNotEmpty(person.getName()) ? person.getName() : person.getNickname());
+
+            // 获取房产信息
+            LambdaQueryWrapper<TaUserVerify> userVerifyLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            userVerifyLambdaQueryWrapper.eq(TaUserVerify::getPersonId,person.getPersonId());
+            List<TaUserVerify> taUserVerifies = taUserVerifyMapper.selectList(userVerifyLambdaQueryWrapper);
+            if (taUserVerifies.size() > 0){
+                TaUserVerify taUserVerify = taUserVerifies.get(0);
+                tpTicketVO.setAddress(taUserVerify.getPhaseName()+taUserVerify.getBuildingName()+taUserVerify.getUnitName()+taUserVerify.getLevelName()+taUserVerify.getRoomNoName());
+            }
+
             tpTicketArrayList.add(tpTicketVO);
         }
         HashMap map=new HashMap<>();
@@ -298,7 +358,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TpTicketRecord tpTicketRecord= new TpTicketRecord();
         tpTicketRecord.setOrgId(orgId);
         tpTicketRecord.setTicketId(ticketId);
-        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + taUser.getUserName()+",联系方式:" + taUser.getLoginName());
+        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + taUser.getUserName()+",联系方式:" + taUser.getPhone());
         tpTicketRecord.setStatus("3");
         tpTicketRecord.setCreateUser(user.toString());
         tpTicketRecord.setCreateDate(LocalDateTime.now());
@@ -309,37 +369,82 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         queryWrapper.eq("id", ticketId);
         queryWrapper.eq("org_id", orgId);
         TpTicket ticket = tpTicketMapper.selectOne(queryWrapper);
-        Message message = new Message();
-        message.setOrgId(orgId);
-        message.setMessageType(ticket.getType());
-        message.setTicketId(ticket.getId());
-        message.setAdviceType("4");
-        message.setUuid(userID.toString());
-        message.setModelType("2");
-        message.setUuidType("2");
-        message.setSource("2");
-        message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给您，点击查看并处理");
-        message.setStatus("1");
-        message.setReadStatus("0");
-        message.setCreateUser(user.toString());
-        message.setCreateDate(LocalDateTime.now());
-        message.setTicketId(ticketId);
-//        messageMapper.insert(message);
-        //如果分配给本人维护消息模板
-        if (null!=userID&userID.equals(user)){
-            message.setModelType("1");
-//            messageMapper.insert(message);
+        // 发送消息给管家的公众号
+        LambdaQueryWrapper<TaPerson> taPersonLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        taPersonLambdaQueryWrapper.eq(TaPerson::getOrgId,orgId);
+        taPersonLambdaQueryWrapper.eq(TaPerson::getUserId,taUser.getUserId());
+        TaPerson taPerson = taPersonMapper.selectOne(taPersonLambdaQueryWrapper);
+        if (null != taPerson){
+            LambdaQueryWrapper<TaMpMiniapp> taMpMiniappLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            taMpMiniappLambdaQueryWrapper.eq(TaMpMiniapp::getMiniappPersonId,taPerson.getPersonId());
+            TaMpMiniapp taMpMiniapp = taMpMiniappMapper.selectOne(taMpMiniappLambdaQueryWrapper);
+            if (null != taMpMiniapp){
+                TaMpPerson taMpPerson = taMpPersonMapper.selectById(taMpMiniapp.getMpPersonId());
+                sendMpTicketMessage(ticket,taMpPerson);
+            }
+
         }
-        //分配成功后推送app
-        message.setUuidType("1");
-        message.setUuid(ticket.getCreateUser());
-        message.setMessageContent("工单“" + ticket.getTicketTitle() + "”已被分配给:"+taUser.getUserName());
-        message.setAdviceType("1");
-//        messageMapper.insert(message);
+
         response.addSuccess("成功");
         return response;
     }
 
+    /**
+     * 发送消息给管家
+     * @param ticket
+     * @param person
+     */
+    private void sendMpTicketMessage(TpTicket ticket,TaMpPerson person) {
+        WxMpService mpService = wxUtils.getMpService(ticket.getOrgId());
+
+        // 对应表数据
+        TaMpInfo mpInfo = iTaMpInfoService.getByOrgId(ticket.getOrgId());
+
+        TaMiniapp taMiniapp = iMiniAppService.getAppByOrg(mpInfo.getOrgId());
+
+        WxMpKefuMessage kefuMessage = WxMpKefuMessage.MINIPROGRAMPAGE().appId(taMiniapp.getMiniappId())
+                .toUser(person.getMpOpenid())
+                .title("您有一个新的工单待处理")
+                .pagePath(miniAppTicket + ticket.getId())
+                .thumbMediaId(mpInfo.getMiniappMedia())
+                .build();
+
+        try {
+            mpService.getKefuService().sendKefuMessage(kefuMessage);
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+
+            // 如果客服消息发送失败, 则发送普通模板消息
+            List<TaMpTemplate> mpTemplateList = iTaMpTemplateService.getAvailableList(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
+            if (null == mpTemplateList || mpTemplateList.size() < 1) {
+                return;
+            }
+            TaMpTemplate mpTemplate = mpTemplateList.get(0);
+
+            try {
+                TaPerson propOwner = iTaPersonService.getById(ticket.getPersonId());
+                String message = String.format("业主电话: %s ; 报修内容: %s", propOwner.getPhone(), ticket.getTicketTitle());
+                String remark = String.format("请及时进入【%s】小程序进行处理", taMiniapp.getName());
+
+                WxUtils.sendTemplateMessage(mpService,
+                        person.getMpOpenid(),
+                        mpTemplate.getTemplateCode(),
+                        null,
+                        new ArrayList<WxMpTemplateData>(){{
+                            add(new WxMpTemplateData("first", "工单提醒"));
+                            add(new WxMpTemplateData("keyword1", "您有一个新的工单"));
+                            add(new WxMpTemplateData("keyword2", DateUtils.today()));
+                            add(new WxMpTemplateData("keyword3", message));
+                            add(new WxMpTemplateData("remark", remark));
+                        }}
+                );
+            } catch (Exception e2) {
+                e2.printStackTrace();
+            }
+
+        }
+    }
+
     @Override
     public ResponseBean addWxRecord(String parameter, Integer user, Integer orgId) {
         ResponseBean response=new ResponseBean();
@@ -362,7 +467,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TpTicketRecord tpTicketRecord= new TpTicketRecord();
         tpTicketRecord.setOrgId(orgId);
         tpTicketRecord.setTicketId(ticketId);
-//        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getLoginName());
+//        tpTicketRecord.setContent("您的联系单已经分配给物业处理人员" + userName.getUserName()+",联系方式:" + userName.getPhone());
         tpTicketRecord.setContent("您的联系单已经分配给维修人员" + taUser.getUserName()+",联系方式:" + taUser.getPhone());
         tpTicketRecord.setStatus("3");
         tpTicketRecord.setCreateUser(user.toString());
@@ -412,7 +517,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     }
 
     @Override
-    public ResponseBean updateTicketStatus(String parameter, Integer id,Integer orgId,String userName,String LoginName) {
+    public ResponseBean updateTicketStatus(String parameter, Integer id,Integer orgId,String userName,String phone) {
         /*拒绝处理仅在待分配的情况下修改，由前台控制拒绝处理的按钮是否显示*/
         ResponseBean response=  new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
@@ -428,7 +533,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
         TpTicketRecord tpTicketRecord= new TpTicketRecord();
         tpTicketRecord.setTicketId(ticketId);
-        tpTicketRecord.setContent("您的报修被物业人员"+userName+"拒绝接受理，原因:"+textContent+",有问题可以联系"+userName+":联系方式:"+LoginName);
+        tpTicketRecord.setContent("您的报修被物业人员"+userName+"拒绝接受理，原因:"+textContent+",有问题可以联系"+userName+":联系方式:"+phone);
         tpTicketRecord.setOrgId(orgId);
         tpTicketRecord.setStatus("1");
         tpTicketRecord.setCreateUser(id.toString());
@@ -478,7 +583,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     }
 
     @Override
-    public ResponseBean updateTicket(String parameter, Integer id, Integer orgId, String userName,String longName) {
+    public ResponseBean updateTicket(String parameter, Integer id, Integer orgId, String userName,String phone) {
         ResponseBean response=new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
         String  content = object.getString("content");
@@ -495,7 +600,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
        TpTicket tpTicketUserID= tpTicketMapper.selectById(ticketId);
 //        User userNameTpUserId= userMapper.selectById(tpTicketUserID.getTpUserId());
 //        TaUser taUser = taUserMapper.selectById(tpTicketUserID.getTaUserId());
-        tpTicketRecord.setContent("物业工作人员"+userName+"已经处理结束,如果没有问题请给好评,联系方式:"+longName);
+        tpTicketRecord.setContent("物业工作人员"+userName+"已经处理结束,如果没有问题请给好评,联系方式:"+phone);
         tpTicketRecord.setStatus("4");
         tpTicketRecord.setCreateUser(id.toString());
         tpTicketRecord.setCreateDate(LocalDateTime.now());
@@ -1119,9 +1224,11 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
         // 新建缴费项
         Bill bill = new Bill();
+        bill.setIsTicket(true);
         bill.setBillName(tpTicket.getTicketTitle());
         bill.setBillExplain(ticket.getPriceExplain());
-        bill.setEndDate(Date.from(LocalDateTime.now().plusMonths(1).atZone( ZoneId.systemDefault()).toInstant()));
+        // 当前时间的下个月初 - 1秒 = 本月月末的最后时间
+        bill.setEndDate(LocalDateTime.now().plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()).minusSeconds(1));
         bill.setPayPrice(ticket.getPrice().toString());
 
         bill.setPayedNum(0);
@@ -1129,6 +1236,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         bill.setCreateDate(new Date());
         bill.setCreateUser(userId);
         bill.setOrgId(orgId);
+        bill.setCommunityId(tpTicket.getCommunityId());
         bill.setPayTotalNum(1);
         bill.setUnpayedNum(1);
         billMapper.insert(bill);
@@ -1136,6 +1244,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         // 新增缴费单
         BillInvoice billInvoice = new BillInvoice();
         billInvoice.setOrgId(orgId);
+        billInvoice.setCommunityId(tpTicket.getCommunityId());
         billInvoice.setBillId(bill.getId());
 
         // 获取房间号
@@ -1222,4 +1331,19 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
         return ResponseBean.success(map);
     }
+
+    @Override
+    public int getTicketNum(Integer orgId, String startDate, String endDate) {
+        return tpTicketMapper.getTicketNum(orgId, startDate, endDate);
+    }
+
+    @Override
+    public List<Map<String, Object>> getTicketMapList(Integer orgId, String startDate, String endDate) {
+        return tpTicketMapper.getTicketMapList(orgId, startDate, endDate);
+    }
+
+    @Override
+    public int getStartNum(Integer orgId) {
+        return tpTicketMapper.getStartNum(orgId);
+    }
 }

src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java

@@ -87,4 +87,6 @@ public class TpTicketVO extends TpTicket {
     private Boolean isPay;
 
     private List<TaUserVerify> userVerifyList;
+
+    private String address;
 }

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

@@ -13,6 +13,7 @@ import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -140,4 +141,6 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @return
      */
     ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
+
+    Map<String, Integer> getLastActEnlistNum(Integer orgId);
 }

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

@@ -118,4 +118,6 @@ public interface ITaPersonService extends IService<TaPerson> {
                    TaCustomerFrom customerFrom) throws Exception;
 
     ResponseBean updateUserPhoto(String photoUrl, String openId);
+
+    IPage<TaPerson> getPersonBy(IPage<TaPerson> page, Integer orgId, String name, String phone, String recommended);
 }

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

@@ -19,4 +19,6 @@ import java.util.List;
 public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
 	
 	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange, List<TaPersonBuilding> taPersonBuildingList);
+
+    int getTotalNum(Integer orgId);
 }

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

@@ -15,5 +15,5 @@ import com.huiju.estateagents.entity.TpNews;
  */
 public interface ITpNewsService extends IService<TpNews> {
 
-    IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status,String newsTypeId);
+    IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status, String newsTypeId, String startCreateDate, String endCreateDate);
 }

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

@@ -31,10 +31,7 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -399,6 +396,11 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         return ResponseBean.success(hashMap);
     }
 
+    @Override
+    public Map<String, Integer> getLastActEnlistNum(Integer orgId) {
+        return taActivityDynamicEnlistMapper.getLastActEnlistNum(orgId);
+    }
+
     /**
      * 获取我的活动列表
      * @param pageNumber

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

@@ -950,6 +950,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         if (userList.size() > 0){
             TaUser taUser = userList.get(0);
             person.setPersonType(taUser.getType());
+            person.setUserId(taUser.getUserId());
         }
         updateById(person);
 
@@ -1322,4 +1323,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         responseBean.addSuccess("修改成功");
         return responseBean;
     }
+
+    @Override
+    public IPage<TaPerson> getPersonBy(IPage<TaPerson> page, Integer orgId, String name, String phone, String recommended) {
+        return taPersonMapper.getPersonBy(page, orgId, name, phone, recommended);
+    }
 }

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

@@ -42,4 +42,9 @@ public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMap
 		page.setRecords(list);
 		return ResponseBean.success(page);
 	}
+
+	@Override
+	public int getTotalNum(Integer orgId) {
+		return taPointsExchangeMapper.getTotalNum(orgId);
+	}
 }

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

@@ -523,6 +523,10 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
         // 缴费金额乘以积分加积分
         BillInvoice tpBillInvoice = tpBillInvoiceMapper.selectById(source.getTpBillInvoiceId());
         int money = tpBillInvoice.getPayPrice() / 100;
+        if (money == 0) {
+            return;
+        }
+
         // 发放积分
         TaPerson person = taPersonMapper.selectById(source.getCreateUser());
         if (savePoints(person, changeType, null, pointsAmount * money, orgId)) {

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

@@ -22,13 +22,16 @@ import org.springframework.stereotype.Service;
 public class TpNewsServiceImpl extends ServiceImpl<TpNewsMapper, TpNews> implements ITpNewsService {
 
     @Override
-    public IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status,String newsTypeId) {
+    public IPage<TpNews> getListBy(IPage<TpNews> page, Integer orgId, String newsName, Integer status, String newsTypeId, String startCreateDate, String endCreateDate) {
         QueryWrapper<TpNews> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId);
         queryWrapper.eq(!StringUtils.isEmpty(newsTypeId),"news_type_id", newsTypeId);
         queryWrapper.eq(status != null, "status", status);
         queryWrapper.gt(status == null, "status", CommConstant.STATUS_DELETE);
         queryWrapper.like(!StringUtils.isEmpty(newsName), "news_name", "%" + newsName + "%");
+        if (!StringUtils.isEmpty(startCreateDate)){
+            queryWrapper.between("create_date",startCreateDate,endCreateDate);
+        }
         queryWrapper.orderByDesc("weight");
         queryWrapper.orderByDesc("create_date");
 

src/main/resources/application-dev.yml

@@ -80,7 +80,7 @@ pay-refund: https://dev.fangdeal.cn/api/refund/
 
 # 支付回调
 pay-new-notify:
-  wx-bill-notify: https://a.t.njyunzhi.com/api/wxBillNotify
+  wx-bill-notify: https://xs.njyunzhi.com/api/wxBillNotify
   ali-bill-notify:
   wx-car-notify:
   ali-car-notify:

src/main/resources/application-prod.yml

@@ -86,7 +86,7 @@ pay-refund: https://wx.fangdeal.cn/api/refund/
 
 # 支付回调
 pay-new-notify:
-  wx-bill-notify: https://a.t.njyunzhi.com/api/wxBillNotify
+  wx-bill-notify: https://xs.njyunzhi.com/api/wxBillNotify
   ali-bill-notify:
   wx-car-notify:
   ali-car-notify:

src/main/resources/application.yml

@@ -14,6 +14,7 @@ sms-service:
 wx:
   miniapp:
     index: /pages/ShouYe/index
+    ticket: /pages/WoDe/YeZhuBaoXiu/index?id=
   mp:
-    festivalH5: https://xs.ycjcjy.com/jierih5.html
-    birthdayH5: https://xs.ycjcjy.com/shengrih5.html
+    festivalH5: https://xs.njyunzhi.com/jierih5.html
+    birthdayH5: https://xs.njyunzhi.com/shengrih5.html

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -37,7 +37,7 @@
             select ifnull(sum( attend_num ), 0) from ta_activity_dynamic_enlist where dynamic_id = #{dynamicId} and org_id = #{orgId}
         </select>
 
-    <select id="getTaActivityDynamicEnlistExport" resultType="com.huiju.estateagents.excel.TaActivityDynamicEnlistExport">
+    <select id="getTaActivityDynamicEnlistExport" resultType="com.huiju.estateagents.excel.HelpInitiateRecordSucceed">
 
         SELECT
         tade.*,
@@ -66,4 +66,24 @@
         group by tade.person_id
         limit #{pageCode}, #{pageSize}
     </select>
+    <select id="getLastActEnlistNum" resultType="java.util.Map">
+        SELECT
+            t.dynamic_id as dynamicId,
+            t.title,
+            count( IFNULL( s.attend_num, 0 ) ) as num
+        FROM
+            ta_building_dynamic t
+            LEFT JOIN ta_activity_dynamic_enlist s ON s.dynamic_id = t.dynamic_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.end_date &gt;= now( )
+            AND t.start_date &lt;= now( )
+            AND t.`status` = 1
+            AND t.is_enlist = 1
+        GROUP BY
+            t.dynamic_id
+        ORDER BY
+            t.end_date DESC
+        LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -639,6 +639,30 @@ FROM
             INNER JOIN td_city b ON b.citycode = a.citycode
             AND b.leveltype = 2
     </select>
+    <select id="getPersonBy" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            t.*,
+            s.nickname AS share_person_name
+        FROM
+            ta_person t
+            LEFT JOIN ta_person s ON s.org_id = t.org_id
+            AND t.recommend_person = s.person_id
+        WHERE
+            t.org_id = #{orgId}
+        <if test="name != null and '' != name">
+            AND t.nickname LIKE CONCAT( '%', #{name}, '%' )
+        </if>
+        <if test="phone != null and '' != phone">
+            AND t.phone = 123
+        </if>
+        <if test="recommended != null and '' != recommended">
+            AND s.nickname LIKE CONCAT( '%', #{recommended}, '%' )
+        </if>
+            AND IFNULL( t.avatarurl, '' ) > ''
+            AND t.`status` > - 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 
     <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
         insert into ta_person_position