From e710bc978fc3fd0c8426fd7c5e07625a1a9bd5d1 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 15 May 2020 13:55:06 +0800 Subject: [PATCH] =?UTF-8?q?issue=E8=A1=A8=E5=BB=BA=E8=A1=A8=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E7=94=B1date?= =?UTF-8?q?=E6=94=B9=E6=88=90datetime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java | 1 - .../src/main/resources/db.migration/epmet_gov_issue.sql | 8 ++++---- .../src/main/resources/mapper/IssueProcessDao.xml | 4 ++-- .../java/com/epmet/modules/feign/GovOrgFeignClient.java | 4 ++-- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 7 ++++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java index c9969328bb..16ac17dca2 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueShiftedFromTopicFormDTO.java +++ b/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; /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql b/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql index 85fc5c249e..978b6ee246 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/db.migration/epmet_gov_issue.sql +++ b/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 '表决截止日期', - `DECIDED_TIME` date NOT NULL COMMENT '表决发起日期（转议题日期）', - `SHIFTED_TIME` date DEFAULT NULL COMMENT '转项目日期 （服务间调用日期一致性）', - `CLOSED_TIME` date DEFAULT NULL COMMENT '关闭日期', + `VOTING_DEADLINE` datetime(0) DEFAULT NULL COMMENT '表决截止日期', + `DECIDED_TIME` datetime(0) NOT NULL COMMENT '表决发起日期（转议题日期）', + `SHIFTED_TIME` datetime(0) 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 '创建人', diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml index ce252667b7..046105f279 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProcessDao.xml @@ -85,10 +85,10 @@ #{createdTime}, - + #{createdBy}, - + #{createdTime}, diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java index f89ba95c04..26ea5eebb8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovOrgFeignClient.java +++ b/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 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 gridDataFilter(CommonGridIdFormDTO gridForm); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 25e377b20e..2407a82b00 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/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 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);