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

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-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/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;
 
@@ -104,4 +107,4 @@ public class UserAdviceExcel {
     private Date updatedTime;
 
 
-}
+}

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/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);
+
+        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);
 
-        IPage<UserAdviceEntity> result = baseDao.selectPage(page,wrapper);
+        return getPageData(result, AdviceListResultDTO.class);
-        return null;
     }
 }

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

@@ -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) {
-        certificationDetailFormDTO.setUserId(tokenDto.getUserId());
+        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/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,