Merge remote-tracking branch 'origin/dev_temp' into dev_temp

# Conflicts:
#	epmet-module/data-report/data-report-server/pom.xml
#	epmet-module/data-statistical/data-statistical-server/pom.xml
#	epmet-module/epmet-message/epmet-message-server/pom.xml
#	epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
#	epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
#	epmet-module/epmet-third/epmet-third-server/pom.xml
#	epmet-module/gov-org/gov-org-server/pom.xml
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
#	epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
#	epmet-module/gov-project/gov-project-server/pom.xml
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-report-server:
     container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.44
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.45
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -2,7 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.132</version>
+
+    <version>0.3.45</version>
     <artifactId>data-report-server</artifactId>
 
     <parent>

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java

@@ -63,6 +63,7 @@ public class FactIndexController {
      * @Description 按月查询各项指标数据
      * @author sun
      */
+
     @PostMapping("index/ablitylist")
     public Result<List<AblityListResultDTO>> ablityList(@RequestBody AblityListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AblityListFormDTO.AddUserInternalGroup.class);

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.62
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.69
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.193</version>
+    <version>0.3.69</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-message-server:
     container_name: epmet-message-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.28
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.29
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.31</version>
+    <version>0.3.29</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-message</artifactId>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -155,20 +155,31 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
                     if (WxmpMessageConstant.RESI.equals(clientType)) {
                         UserBasicInfoFormDTO userBasicInfoFormDTO = new UserBasicInfoFormDTO();
                         userBasicInfoFormDTO.setUserId(userId);
-                        openId = epmetUserOpenFeignClient.getUserBasicInfo(userBasicInfoFormDTO).getData().getOpenId();
+                        Result<UserBasicInfo> userBasicInfo = epmetUserOpenFeignClient.getUserBasicInfo(userBasicInfoFormDTO);
+                        if (userBasicInfo.getCode() != 0){
+                            throw new Exception(userBasicInfo.getInternalMsg());
+                        }else {
+                            openId = userBasicInfo.getData().getOpenId();
+                        }
                     } else if (WxmpMessageConstant.GOV_DB.equals(clientType)) {
                         StaffBasicInfoFormDTO staffBasicInfoFormDTO = new StaffBasicInfoFormDTO();
                         staffBasicInfoFormDTO.setStaffId(userId);
-                        openId = epmetUserOpenFeignClient.getStaffBasicInfo(staffBasicInfoFormDTO).getData().getOpenId();
+                        Result<StaffBasicInfo> staffBasicInfo = epmetUserOpenFeignClient.getStaffBasicInfo(staffBasicInfoFormDTO);;
+                        if (staffBasicInfo.getCode() != 0){
+                            throw new Exception(staffBasicInfo.getInternalMsg());
+                        }else {
+                            openId = staffBasicInfo.getData().getOpenId();
+                        }
                     } else {
                         throw new WxSubscribeException("clientType有误", "", openId);
                     }
                 } catch (Exception e) {
-                    throw new WxSubscribeException("连接User服务失败" + e.getMessage(), "", "");
+                    e.printStackTrace();
+                    throw new WxSubscribeException("获取openId失败:" + e.getMessage(), "", "");
                 }
 
                 if (StringUtils.isBlank(openId)) {
-                    throw new WxSubscribeException("openId获取失败", "", "");
+                    throw new WxSubscribeException("该userId未查询到关联的openId", "", "");
                 }
                 //获取模板id
                 if (customerTemplateListResultDTOS.size() > NumConstant.ZERO) {

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@@ -2,6 +2,7 @@ version: "3.7"
 services:
   epmet-oss-server:
     container_name: epmet-oss-server-dev
+#    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
     image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:version_placeholder
     ports:
       - "8083:8083"

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -40,12 +40,12 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
 

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.147
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.149
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.143</version>
+    <version>0.0.149</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml

@@ -104,7 +104,7 @@
         AND pt.customer_id = #{customerId}
         AND pt.tid = #{publicId}
         AND key_ids = #{keyIds}<!-- 消息更新,详情内容,时间 -->
-        ORDER BY created_time ASC
+        ORDER BY pt.created_time ASC
     </select>
     <select id="selectListByKey" resultType="com.epmet.dto.PersonalTemplateDTO">
         SELECT ID

epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.91
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.92
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.98</version>
+    <version>0.3.92</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -249,6 +249,24 @@ public class CustomerAgencyController {
         return new Result<StaffInAgencyListResultDTO>().ok(customerAgencyService.staffInAgencyList(tokenDTO.getUserId()));
     }
 
+    /**
+     * @Description 对外接口-根据组织Id获取组织信息
+     * @author sun
+     **/
+    @PostMapping("agencyinfo")
+    Result<AgencyInfoResultDTO> agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) {
+        return new Result<AgencyInfoResultDTO>().ok(customerAgencyService.agencyInfo(formDTO));
+    }
+
+    /**
+     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
+     * @author sun
+     **/
+    @PostMapping("organizetree/{agencyId}")
+    Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
+        return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
+    }
+
     /**
      * @Description 对外接口，根据customerId返回Element UI中Tree结构的agency列表
      * @param customerId
@@ -277,22 +295,4 @@ public class CustomerAgencyController {
         }
         return new Result<Set<String>>().ok(customerAgencyService.getAgencyElementTree(customerId).getDefaultKeys());
     }
-
-    /**
-     * @Description 对外接口-根据组织Id获取组织信息
-     * @author sun
-     **/
-    @PostMapping("agencyinfo")
-    Result<AgencyInfoResultDTO> agencyInfo(@RequestBody AgencyInfoFormDTO formDTO) {
-        return new Result<AgencyInfoResultDTO>().ok(customerAgencyService.agencyInfo(formDTO));
-    }
-
-    /**
-     * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
-     * @author sun
-     **/
-    @PostMapping("organizetree/{agencyId}")
-    Result<OrganizeTreeResultDTO> organizeTree(@PathVariable("agencyId") String agencyId) {
-        return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
-    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@@ -176,16 +176,6 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      **/
     AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId);
 
-    /**
-     * @Description 返回elementTree结构的agency树
-     * @param customerId
-     * @param pid
-     * @return java.util.List<com.epmet.dto.result.AgencyElementTreeResultDTO.Agency>
-     * @Author liushaowen
-     * @Date 2020/11/6 14:57
-     */
-    List<AgencyElementTreeResultDTO.Agency> getAgencyElementTree(@Param("customerId") String customerId,@Param("pid") String pid);
-
     /**
      * @Description 外挂-获取当前组织及部门、网格数据，递归查询所有下级数据
      * @author sun
@@ -206,4 +196,14 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @author sun
      **/
     List<OrganizeTreeResultDTO> selectAllSub(@Param("agencyId") String agencyId);
+
+    /**
+     * @Description 返回elementTree结构的agency树
+     * @param customerId
+     * @param pid
+     * @return java.util.List<com.epmet.dto.result.AgencyElementTreeResultDTO.Agency>
+     * @Author liushaowen
+     * @Date 2020/11/6 14:57
+     */
+    List<AgencyElementTreeResultDTO.Agency> getAgencyElementTree(@Param("customerId") String customerId,@Param("pid") String pid);
 }

epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.45
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.46
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

epmet-module/gov-project/gov-project-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.53</version>
+    <version>0.3.46</version>
     <parent>
         <artifactId>gov-project</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-guide-server:
     container_name: resi-guide-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.20
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.21
     ports:
       - "8091:8091"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -645,6 +645,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		String messageContent = String.format(userMsg, gridName);
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
+		userMessageFormDTO.setUserId(formDTO.getUserId());
 
 		//发送微信订阅消息
 		WxSubscribeMessageFormDTO wxSubscribeMessageFormDTO = new WxSubscribeMessageFormDTO();
@@ -652,7 +653,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		wxSubscribeMessageFormDTO.setUserId(formDTO.getUserId());
 		wxSubscribeMessageFormDTO.setClientType(AppClientConstant.APP_RESI);
 		wxSubscribeMessageFormDTO.setGridId(formDTO.getGridId());
-		wxSubscribeMessageFormDTO.setBehaviorType(ResiWarmUserMessageConstant.WX_WARMHEARTED_BEHAVIOR);
+		wxSubscribeMessageFormDTO.setBehaviorType(PartyMemberMessageConstant.WX_PARTY_AUTH_BEHAVIOR);
 		wxSubscribeMessageFormDTO.setMessageContent(messageContent);
 		wxSubscribeMessageFormDTO.setMessageTime(new Date());
 		List<WxSubscribeMessageFormDTO> msgList = new ArrayList<>();

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/BadgeFormDTO.java

@@ -21,4 +21,8 @@ public class BadgeFormDTO implements Serializable {
 	 * 每页显示数量
 	 */
 	private Integer pageSize = 20;
+	/**
+	 * 网格Id
+	 */
+	private String gridId;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CertificationAddFormDTO.java

@@ -47,7 +47,7 @@ public class CertificationAddFormDTO implements Serializable {
     /**
      * 身份证号
      */
-    private String idCard;
+    private String idcard;
 
     /**
      * 认证证件图片url

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/AdviceListResultDTO.java

@@ -0,0 +1,50 @@
+package com.epmet.dto.result;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/9 14:46
+ */
+@Data
+public class AdviceListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 建议id
+     */
+    private String id;
+
+    /**
+     * 客户名
+     */
+    private String customerName;
+
+    /**
+     * 网格名
+     */
+    private String gridName;
+
+    /**
+     * 建议类型
+     */
+    private String adviceType;
+
+    /**
+     * 提交的电话
+     */
+    private String phone;
+
+    /**
+     * 建议时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date adviceTime;
+
+    private String adviceContent;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java

@@ -26,7 +26,7 @@ public class CertificationDetailResultDTO implements Serializable {
     /**
      * 身份证号
      */
-    private String idCard;
+    private String idcard;
 
     /**
      * 是否认证 yes 认证 no 已认证

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -328,13 +328,6 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping(value = "epmetuser/staffagencyvisited/getstaffbasicinfo")
     Result<StaffBasicInfo> getStaffBasicInfo(@RequestBody StaffBasicInfoFormDTO formDTO);
 
-    /**
-     * 根据staffId查询用户基本信息
-     * @author sun
-     */
-    @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
-    Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
-
     /**
      * 修改个人信息
      * @author zhaoqifeng
@@ -380,4 +373,11 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/more/badge/openedorclosed")
     Result openedOrClosed(@RequestBody OpenedOrClosedFormDTO openedOrClosedFormDTO);
+
+    /**
+     * 根据staffId查询用户基本信息
+     * @author sun
+     */
+    @PostMapping("/epmetuser/customerstaff/getstaffbasicinfo")
+    Result<BasicInfoResultDTO> getStaffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java

@@ -31,6 +31,7 @@ import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.form.AdviceListFormDTO;
 import com.epmet.dto.form.ReplyAdviceFormDTO;
 import com.epmet.dto.result.AdviceDetailResultDTO;
+import com.epmet.dto.result.AdviceListResultDTO;
 import com.epmet.excel.UserAdviceExcel;
 import com.epmet.service.UserAdviceService;
 import org.apache.commons.lang3.StringUtils;
@@ -116,9 +117,12 @@ public class UserAdviceController {
     }
 
     @PostMapping("advicelist")
-    public Result<PageData<UserAdviceDTO>> adviceList(AdviceListFormDTO dto){
+    public Result<PageData<AdviceListResultDTO>> adviceList(AdviceListFormDTO dto){
         ValidatorUtils.validateEntity(dto);
-        PageData<UserAdviceDTO> page = userAdviceService.adviceList(dto);
+        if (dto.getStartTime().after(dto.getEndTime())){
-        return new Result<PageData<UserAdviceDTO>>().ok(page);
+            throw new RenException("开始时间不能大于结束时间");
+        }
+        PageData<AdviceListResultDTO> page = userAdviceService.adviceList(dto);
+        return new Result<PageData<AdviceListResultDTO>>().ok(page);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java

@@ -19,15 +19,10 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.BadgeDTO;
-import com.epmet.dto.result.BadgeAuditRecordResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.BadgeAuditingResultDTO;
-import com.epmet.dto.result.BadgeDetailResultDTO;
-import com.epmet.dto.result.BadgeListResultDTO;
-import com.epmet.dto.result.UserBadgeListResultDTO;
 import com.epmet.entity.BadgeEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
 import java.util.List;
 
@@ -42,103 +37,114 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 
 	/**
 	 * 获取徽章列表
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/3 17:30
 	 * @param customerId
 	 * @return java.util.List<com.epmet.dto.result.BadgeListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/3 17:30
 	 */
 	List<BadgeListResultDTO> selectList(@Param("customerId") String customerId);
 
 	/**
 	 * 重名校验
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/4 10:40
 	 * @param customerId
 	 * @param badgeName
 	 * @return java.util.List<com.epmet.dto.result.BadgeListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 10:40
 	 */
 	List<BadgeListResultDTO> getDuplicateName(@Param("customerId") String customerId, @Param("badgeName") String badgeName);
 
 	/**
 	 * 编辑重名校验
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/4 15:09
 	 * @param customerId
 	 * @param badgeId
 	 * @param badgeName
 	 * @return java.util.List<com.epmet.dto.result.BadgeListResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:09
 	 */
 	List<BadgeListResultDTO> getDuplicateNameForEdit(@Param("customerId") String customerId, @Param("badgeId") String badgeId,
 													 @Param("badgeName") String badgeName);
 
 	/**
 	 * 获取徽章详情
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/4 14:30
 	 * @param customerId
 	 * @param badgeId
 	 * @return com.epmet.dto.result.BadgeDetailResultDTO
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 14:30
 	 */
 	BadgeDetailResultDTO selectDetail(@Param("customerId") String customerId, @Param("badgeId") String badgeId);
 
 	/**
 	 * 获取徽章信息
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/4 15:16
 	 * @param customerId
 	 * @param badgeId
 	 * @return com.epmet.entity.BadgeEntity
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:16
 	 */
 	BadgeEntity selectBadgeInfo(@Param("customerId") String customerId, @Param("badgeId") String badgeId);
 
 	/**
 	 * 更新徽章信息
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/4 15:38
 	 * @param entity
 	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:38
 	 */
 	void updateBadge(BadgeEntity entity);
 
 	/**
 	 * 删除徽章信息
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/4 15:39
 	 * @param customerId
 	 * @param badgeId
 	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/11/4 15:39
 	 */
 	void deleteBadge(@Param("customerId") String customerId, @Param("badgeId") String badgeId);
 
 
 	/**
 	 * 待审核列表
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/5 10:01
 	 * @param customerId
 	 * @param pageNo
 	 * @param pageSize
+	 * @param gridId
 	 * @return java.util.List<com.epmet.dto.result.BadgeAuditingResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/5 10:01
 	 */
 	List<BadgeAuditingResultDTO> selectAuditingList(@Param("customerId") String customerId, @Param("pageNo") Integer pageNo,
-													@Param("pageSize") Integer pageSize);
+													@Param("pageSize") Integer pageSize, @Param("gridId") String gridId);
 
 	/**
 	 * 审核历史列表
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/5 11:01
 	 * @param customerId
 	 * @param pageNo
 	 * @param pageSize
+	 * @param gridId
 	 * @return java.util.List<com.epmet.dto.result.BadgeAuditRecordResultDTO>
+	 * @author zhaoqifeng
+	 * @date 2020/11/5 11:01
 	 */
 	List<BadgeAuditRecordResultDTO> selectAuditRecord(@Param("customerId") String customerId, @Param("pageNo") Integer pageNo,
-													   @Param("pageSize") Integer pageSize);
+													  @Param("pageSize") Integer pageSize, @Param("gridId") String gridId);
 
 	/**
-	 * @Description 查询客户的徽章
 	 * @param customerId
 	 * @return java.util.List<com.epmet.dto.result.UserBadgeListResultDTO>
+	 * @Description 查询客户的徽章
 	 * @author wangc
 	 * @date 2020.11.05 15:50
 	 */
@@ -146,10 +152,11 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 
 	/**
 	 * 插入数据
-	 * @author zhaoqifeng
+	 *
-	 * @date 2020/11/6 14:46
 	 * @param entity
 	 * @return void
+	 * @author zhaoqifeng
+	 * @date 2020/11/6 14:46
 	 */
 	void insertBadge(BadgeDTO dto);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserAdviceEntity.java

@@ -123,4 +123,9 @@ public class UserAdviceEntity extends BaseEpmetEntity {
      */
 	private String govContent;
 
+	/**
+	 * 建议时间
+	 */
+	private Date adviceTime;
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/UserAdviceExcel.java

@@ -61,6 +61,9 @@ public class UserAdviceExcel {
     @Excel(name = "用户注册手机号")
     private String regPhone;
 
+    @Excel(name = "建议时间")
+    private Date adviceTime;
+
     @Excel(name = "建议描述")
     private String adviceContent;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java

@@ -23,6 +23,7 @@ import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.form.AdviceListFormDTO;
 import com.epmet.dto.form.ReplyAdviceFormDTO;
 import com.epmet.dto.result.AdviceDetailResultDTO;
+import com.epmet.dto.result.AdviceListResultDTO;
 import com.epmet.entity.UserAdviceEntity;
 
 import java.util.List;
@@ -122,5 +123,5 @@ public interface UserAdviceService extends BaseService<UserAdviceEntity> {
      * @Author liushaowen
      * @Date 2020/11/9 10:41
      */
-    PageData<UserAdviceDTO> adviceList(AdviceListFormDTO dto);
+    PageData<AdviceListResultDTO> adviceList(AdviceListFormDTO dto);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java

@@ -21,13 +21,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.Constant;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.constant.BadgeConstant;
 import com.epmet.constant.BadgeMessageConstant;
 import com.epmet.constant.UserConstant;
@@ -289,7 +289,7 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     @Override
     public List<BadgeAuditingResultDTO> auditingList(TokenDto tokenDto, BadgeFormDTO formDTO) {
         int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
-        List<BadgeAuditingResultDTO> list = baseDao.selectAuditingList(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize());
+        List<BadgeAuditingResultDTO> list = baseDao.selectAuditingList(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize(), formDTO.getGridId());
         list.forEach(item -> item.setCreateTime(item.getCreateTime()/NumConstant.SIXTY));
         return list;
     }
@@ -306,7 +306,7 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
     @Override
     public List<BadgeAuditRecordResultDTO> auditRecord(TokenDto tokenDto, BadgeFormDTO formDTO) {
         int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
-        List<BadgeAuditRecordResultDTO> list = baseDao.selectAuditRecord(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize());
+        List<BadgeAuditRecordResultDTO> list = baseDao.selectAuditRecord(tokenDto.getCustomerId(), pageIndex, formDTO.getPageSize(), formDTO.getGridId());
         list.forEach(item ->  item.setCreateTime(item.getCreateTime()/NumConstant.SIXTY));
         return list;
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.form.AdviceListFormDTO;
 import com.epmet.dto.form.ReplyAdviceFormDTO;
 import com.epmet.dto.result.AdviceDetailResultDTO;
+import com.epmet.dto.result.AdviceListResultDTO;
 import com.epmet.entity.UserAdviceEntity;
 import com.epmet.entity.UserAdviceImgEntity;
 import com.epmet.redis.UserAdviceRedis;
@@ -39,14 +40,11 @@ import com.epmet.service.UserAdviceImgService;
 import com.epmet.service.UserAdviceService;
 import io.jsonwebtoken.lang.Collections;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -168,7 +166,6 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         AdviceDetailResultDTO adviceDetailResultDTO = new AdviceDetailResultDTO();
         BeanUtils.copyProperties(userAdviceEntity, adviceDetailResultDTO);
         adviceDetailResultDTO.setAdviceId(userAdviceEntity.getId());
-        adviceDetailResultDTO.setAdviceTime(userAdviceEntity.getCreatedTime());
         //拼接建议类型
         if (!"*".equals(userAdviceEntity.getAdviceType())) {
             StringBuilder type = new StringBuilder();
@@ -207,7 +204,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
      * @Date 2020/11/9 10:41
      */
     @Override
-    public PageData<UserAdviceDTO> adviceList(AdviceListFormDTO dto) {
+    public PageData<AdviceListResultDTO> adviceList(AdviceListFormDTO dto) {
         //page分页
         Page<UserAdviceEntity> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         //时间降序
@@ -215,9 +212,48 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
 
         //wrapper
         QueryWrapper<UserAdviceEntity> wrapper = new QueryWrapper<>();
-
+        //客户Id
+        wrapper.eq(StringUtils.isNotBlank(dto.getCustomerId()), "CUSTOMER_ID", dto.getCustomerId());
+        //是否回复
+        if ("1".equals(dto.getIsReply())) {
+            wrapper.ne("REPLY_USER_ID", "");
+            wrapper.ne("REPLY_CONTENT", "");
+        } else if ("0".equals(dto.getIsReply())) {
+            wrapper.eq("REPLY_USER_ID", "");
+            wrapper.eq("REPLY_CONTENT", "");
+        }
+        // 组织id
+        wrapper.eq(StringUtils.isNotBlank(dto.getAgencyId()), "AGENCY_ID", dto.getAgencyId());
+        //建议类型
+        wrapper.like(StringUtils.isNotBlank(dto.getAdviceType()), "ADVICE_TYPE", dto.getAdviceType());
+        //开始时间
+        wrapper.ge(dto.getStartTime() != null, "CREATED_TIME", dto.getStartTime());
+        //结束时间
+        wrapper.le(dto.getEndTime() != null, "CREATED_TIME", dto.getEndTime());
 
         IPage<UserAdviceEntity> result = baseDao.selectPage(page, wrapper);
-        return null;
+
+        List<UserAdviceEntity> records = result.getRecords();
+
+        //拼接type
+
+        for (int i = 0; i < records.size(); i++) {
+            if (!"*".equals(records.get(i).getAdviceType())) {
+                StringBuilder type = new StringBuilder();
+                if (records.get(i).getAdviceType().contains("gov")) {
+                    type.append(UserAdviceConstant.GOV_TYPE_TEXT);
+                }
+                if (records.get(i).getAdviceType().contains("software")) {
+                    if (type.length() != 0) {
+                        type.append("\\n");
+                    }
+                    type.append(UserAdviceConstant.SOFTWARE_TYPE_TEXT);
+                }
+                records.get(i).setAdviceType(type.toString());
+            }
+        }
+        result.setRecords(records);
+
+        return getPageData(result, AdviceListResultDTO.class);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -146,7 +146,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         }
         userBadgeDao.updateCertificateRecordIsLast(form.getBadgeId(),form.getUserId());
         form.setGridId(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRegisteredGridId());
-        form.setIdNum(certificationAddFormDTO.getIdCard());
+        form.setIdNum(certificationAddFormDTO.getIdcard());
         form.setCertificationImg(certificationAddFormDTO.getCertificationImg());
         form.setSurname(certificationAddFormDTO.getSurname());
         userBadgeDao.insertUserBadgeCertificateRecord(form);
@@ -205,6 +205,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
 
     /**
      * @Description  个人中心-获取徽章认证页面详情
+     * 先判断 userId存在不，不存在从tokenDto获取【工作端和居民端合用一个接口】
      * @Param tokenDto
      * @Param certificationDetailFormDTO
      * @author zxc
@@ -212,7 +213,9 @@ public class UserBadgeServiceImpl implements UserBadgeService {
      */
     @Override
     public CertificationDetailResultDTO certificationDetail(TokenDto tokenDto, CertificationDetailFormDTO certificationDetailFormDTO) {
+        if (StringUtils.isEmpty(certificationDetailFormDTO.getUserId())){
             certificationDetailFormDTO.setUserId(tokenDto.getUserId());
+        }
         return userBadgeDao.selectBadgeAuthRecord(certificationDetailFormDTO.getUserId(), certificationDetailFormDTO.getBadgeId());
     }
 

epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml

@@ -169,6 +169,7 @@
             AUDIT_STATUS = 'auditing'
             AND ubcr.DEL_FLAG = '0'
             AND ubcr.CUSTOMER_ID = #{customerId}
+            AND ubcr.GRID_ID = #{gridId}
         ORDER BY ubcr.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
@@ -202,6 +203,7 @@
             AUDIT_STATUS != 'auditing'
           AND ubcr.DEL_FLAG = '0'
           AND ubcr.CUSTOMER_ID = #{customerId}
+          AND ubcr.GRID_ID = #{gridId}
         ORDER BY ubcr.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>

epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml

@@ -80,7 +80,7 @@
         FROM resi_user_badge
         WHERE
             DEL_FLAG = '0'
-            AND CERTIFICATION_AUTID_STATUS = 'pass'
+            AND CERTIFICATION_AUTID_STATUS = 'approved'
             AND USER_ID = #{userId}
     </select>
 
@@ -89,7 +89,7 @@
         SELECT
             SURNAME,
             NAME,
-            ID_NUM AS idCard,
+            ID_NUM AS idcard,
             ( CASE WHEN AUDIT_STATUS = 'approved' THEN 'yes' ELSE 'no' END ) AS isCertificated,
             MOBILE,
             CERTIFICATION_IMG,