Browse Source

关闭话题添加已解决未解决

dev_shibei_match
zhaoqifeng 5 years ago
parent
commit
ea22b09b81
  1. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java
  2. 7
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
  3. 5
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
  4. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  5. 1
      epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.2__topic.sql

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java

@ -53,6 +53,11 @@ public class ResiTopicDTO implements Serializable {
*/ */
private String status; private String status;
/**
* 是否解决(已解决 resolved未解决 unresolved)
*/
private String closedStatus;
/** /**
* *
*/ */

7
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java

@ -2,6 +2,7 @@ package com.epmet.resi.group.dto.topic.form;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable; import java.io.Serializable;
/** /**
@ -25,6 +26,12 @@ public class ResiTopicOperationFormDTO implements Serializable {
*/ */
private String operateReason; private String operateReason;
/**
* 是否解决(已解决 resolved未解决 unresolved)
*/
@NotBlank(message = "解决状态不能为空")
private String closedStatus;
} }

5
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java

@ -53,6 +53,11 @@ public class ResiTopicEntity extends BaseEpmetEntity {
*/ */
private String status; private String status;
/**
* 是否解决(已解决 resolved未解决 unresolved)
*/
private String closedStatus;
/** /**
* *
*/ */

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

@ -523,6 +523,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
} }
//2.关闭操作 //2.关闭操作
topic.setClosedStatus(closeFormDTO.getClosedStatus());
baseDao.updateById(topic);
List<String> id = new ArrayList<>(); List<String> id = new ArrayList<>();
id.add(closeFormDTO.getTopicId()); id.add(closeFormDTO.getTopicId());
baseDao.cancelHiddenOrCloseBatch(id,tokenDto.getUserId(),TopicConstant.CLOSED); baseDao.cancelHiddenOrCloseBatch(id,tokenDto.getUserId(),TopicConstant.CLOSED);

1
epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.2__topic.sql

@ -0,0 +1 @@
ALTER TABLE resi_topic ADD COLUMN CLOSED_STATUS varchar(32) NULL COMMENT '关闭状态:已解决 resolved,未解决 unresolved' AFTER STATUS;
Loading…
Cancel
Save