diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java index 20f2992fda..a0eeb2df09 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/IssueProcessDTO.java @@ -63,6 +63,11 @@ public class IssueProcessDTO implements Serializable { */ private String operationExplain; + /** + * 组织名称 + * */ + private String orgName; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java new file mode 100644 index 0000000000..6dcf993139 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/TopicInfoDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * 话题详情(议题详情中的) + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class TopicInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + /** + * 话题内容 + */ + private String topicContent; + + /** + * 图片列表 + */ + private List topicImgs; + + /** + * 话题发表人（山东路168-尹女士） + */ + private String publishedUser; + + /** + * 话题发表时间 (时间戳 毫秒级) + */ + private Long publishedTime; + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java index 219426566f..174ac7a057 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/GovIssueDemoController.java @@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*; public class GovIssueDemoController { private static final Logger logger = LoggerFactory.getLogger(GovIssueDemoController.class); - @PostMapping("test") + /* @PostMapping("test") public Result test(@RequestBody DemoTestFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); return new Result().ok("gov-issue-server请求成功"); - } + }*/ } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java index 56c01421a7..6f8021d0df 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/ResiHallDemoController.java @@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*; public class ResiHallDemoController { private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class); - @PostMapping("test") + /* @PostMapping("test") public Result test(@RequestBody DemoTestFormDTO formDTO) { logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); ValidatorUtils.validateEntity(formDTO); return new Result().ok("resi-hall-server请求成功"); - } + }*/ } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java index 701a3c6c61..3dceb5a1e3 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/entity/IssueProcessEntity.java @@ -63,4 +63,9 @@ public class IssueProcessEntity extends BaseEpmetEntity { */ private String operationExplain; + /** + * 组织名称 + * */ + private String orgName; + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java index 587e28e8c2..0873d88c68 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/excel/IssueProcessExcel.java @@ -37,19 +37,22 @@ public class IssueProcessExcel { @Excel(name = "议题ID") private String issueId; - @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed") + @Excel(name = "操作状态") private String issueStatus; - @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID") + @Excel(name = "组织类型 ") private String orgType; @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）") private String orgId; - @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)") + @Excel(name = "部门名称") + private String orgName; + + @Excel(name = "操作说明 ") private String operationExplain; - @Excel(name = "删除标识 0未删除、1已删除") + @Excel(name = "删除标识") private String delFlag; @Excel(name = "乐观锁") 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 c9eb447029..85fc5c249e 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 @@ -206,4 +206,11 @@ CREATE TABLE `issue_vote_statistical_daily` ( SET FOREIGN_KEY_CHECKS = 1; +-- @Date 2020-05-12 10:00 +-- @Author wangc +-- @Description 数据库epmet_gov_issue中的ISSUE_PROCESS(议题进展表)表新增一个字段，db语句： +ALTER TABLE ISSUE_PROCESS ADD ( + ORG_NAME varchar(128) NOT NULL COMMENT '议题当前处理进度所在的部门名称，因为有存储Id，无需担心部门之后有修改名称的可能' + ); + 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 81b04ec584..baadaa6e9e 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 @@ -9,6 +9,7 @@ +