Merge branch 'dev_personal_center' into dev_temp

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/service/impl/TopicServiceImpl.java

@@ -64,7 +64,7 @@ public class TopicServiceImpl implements TopicService {
 
         Result<List<AllGridsByUserIdResultDTO>> rst = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
         if (!rst.success()) {
-            logger.error("查询我创建的话题列表(已转议题),根据网格id查询网格名称失败, InternalMsg:{},Msg:{}", rst.getInternalMsg(), rst.getMsg());
+            logger.error("查询我创建的话题列表(已转项目),根据网格id查询网格名称失败, InternalMsg:{},Msg:{}", rst.getInternalMsg(), rst.getMsg());
         } else {
             List<AllGridsByUserIdResultDTO> gridInfos = rst.getData();
             HashMap<String, String> gridIdAndNames = new HashMap<>();

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

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
@@ -35,12 +36,12 @@ public class AdviceListFormDTO {
     /**
      * 开始时间 可不填
      */
-    private Date startTime;
+    private String startTime;
 
     /**
      * 结束时间 可不填
      */
-    private Date endTime;
+    private String endTime;
 
     /**
      * 页码

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

@@ -42,6 +42,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -145,9 +148,18 @@ public class UserAdviceController {
     @PostMapping("advicelist")
     public Result<PageData<AdviceListResultDTO>> adviceList(@RequestBody AdviceListFormDTO dto) {
         ValidatorUtils.validateEntity(dto);
-        if (dto.getStartTime() != null && dto.getEndTime() != null) {
+        //校验时间
-            if (dto.getStartTime().after(dto.getEndTime())) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                throw new RenException("开始时间不能大于结束时间");
+
+        if (StringUtils.isNotBlank(dto.getStartTime()) && StringUtils.isNotBlank(dto.getEndTime())){
+            try {
+                Date start = sdf.parse(dto.getStartTime());
+                Date end = sdf.parse(dto.getEndTime());
+                if (start.after(end)){
+                    throw new RenException("开始时间不能大于结束时间");
+                }
+            }catch (ParseException e){
+                throw new RenException("日期转换失败");
             }
         }
         PageData<AdviceListResultDTO> page = userAdviceService.adviceList(dto);

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

@@ -61,6 +61,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -264,6 +266,7 @@ public class UserAdviceServiceImpl extends BaseServiceImpl<UserAdviceDao, UserAd
         }
         //建议类型
         wrapper.like(StringUtils.isNotBlank(dto.getAdviceType()), "ADVICE_TYPE", dto.getAdviceType());
+
         //开始时间
         wrapper.ge(dto.getStartTime() != null, "CREATED_TIME", dto.getStartTime());
         //结束时间