issue表建表语句时间类型由date改成datetime

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java

@@ -73,7 +73,6 @@ public class IssueShiftedFromTopicFormDTO implements Serializable {
     /**
      * 议题创建时间
      * */
-    @NotBlank(message = "议题创建时间不能为空")
     private Date createdTime;
 
     /**

epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql

@@ -37,10 +37,10 @@ CREATE TABLE `issue`  (
   `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '网格ID 居民端议题对应一个网格Id',
   `ORG_ID_PATH` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制',
   `ORG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '组织ID 【数据权限-非必填】agencyId',
-  `VOTING_DEADLINE` date DEFAULT NULL COMMENT '表决截止日期',
+  `VOTING_DEADLINE` datetime(0) DEFAULT NULL COMMENT '表决截止日期',
-  `DECIDED_TIME` date NOT NULL COMMENT '表决发起日期（转议题日期）',
+  `DECIDED_TIME` datetime(0) NOT NULL COMMENT '表决发起日期（转议题日期）',
-  `SHIFTED_TIME` date DEFAULT NULL COMMENT '转项目日期 （服务间调用日期一致性）',
+  `SHIFTED_TIME` datetime(0) DEFAULT NULL COMMENT '转项目日期 （服务间调用日期一致性）',
-  `CLOSED_TIME` date DEFAULT NULL COMMENT '关闭日期',
+  `CLOSED_TIME` datetime(0) DEFAULT NULL COMMENT '关闭日期',
   `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除、1已删除',
   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
   `CREATED_BY` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml

@@ -85,10 +85,10 @@
             <if test ='null != createdTime'>
                 #{createdTime},
             </if>
-            <if test ='null != updatedBy'>
+            <if test ='null != createdBy'>
                 #{createdBy},
             </if>
-            <if test ='null != updatedTime'>
+            <if test ='null != createdTime'>
                 #{createdTime},
             </if>
             <if test ='null != orgName'>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java

@@ -30,7 +30,7 @@ public interface GovOrgFeignClient {
      * @Description 查询网格信息
      * @Date 2020/3/30 10:45
      **/
-    @GetMapping("/gov/org/customergrid/getcustomergridbygridid")
+    @PostMapping("/gov/org/customergrid/getcustomergridbygridid")
     Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO);
 
     /**
@@ -59,6 +59,6 @@ public interface GovOrgFeignClient {
      * @Description 获取网格所需要的数据权限内容
      * @Date 2020/3/30 10:45
      **/
-    @GetMapping("/gov/org/customergrid/griddatafilter")
+    @PostMapping("/gov/org/customergrid/griddatafilter")
     Result<CommonDataFilterResultDTO> gridDataFilter(CommonGridIdFormDTO gridForm);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -962,7 +962,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             //没有相应的话题
             logger.error(ModuleConstant.NO_SUCH_TOPIC);
             throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
-        }else if(topic.getShiftIssue() || StringUtils.isNotBlank(topic.getIssueId()) || StringUtils.equals(ModuleConstant.TOPIC_STATUS_DISCUSSING,topic.getStatus())){
+        }else if(topic.getShiftIssue() || StringUtils.isNotBlank(topic.getIssueId()) || !StringUtils.equals(ModuleConstant.TOPIC_STATUS_DISCUSSING,topic.getStatus())){
             logger.error(ModuleConstant.CURRENT_TOPIC_COULD_NOT_TURN_TO_ISSUE);
             throw new RenException(ModuleConstant.CURRENT_TOPIC_COULD_NOT_TURN_TO_ISSUE);
         }
@@ -990,16 +990,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 logger.warn(String.format(ModuleConstant.DATE_FORMAT_PARSE_FAILURE,e.getMessage()));
             }
             ResiGroupInfoRedisDTO group = resiGroupRedis.get(topic.getGroupId());
-            if(null == group && StringUtils.isNotBlank(group.getGroupId())){
+            if(null == group || StringUtils.isNotBlank(group.getGroupId())){
                 CustomerGridFormDTO gridForm = new CustomerGridFormDTO();
                 gridForm.setGridId(group.getGridId());
                 Result<CustomerGridDTO> gridInfoResult = govOrgFeignClient.getCustomerGridByGridId(gridForm);
                 if(gridInfoResult.success() && null != gridInfoResult.getData() && StringUtils.isNotBlank(gridInfoResult.getData().getId())) {
                     result.setBelongGridName(gridInfoResult.getData().getGridName());
                 }
-            }
+            }else {
                 logger.error(ModuleConstant.NO_SUCH_GROUP);
                 result.setBelongGridName(ModuleConstant.EMPTY_STR);
+            }
                 return result;
         }
         throw new RenException(ModuleConstant.FAILED_QUERY_TOPIC_INFO);