wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1507' of axzsource.com:universal/infrastructure/backend/msg-center-plat into dev

Browse Source
This commit is contained in:
luofu 2023-11-15 17:17:15 +08:00
commit 794830ff5a
7 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java
View File

@ -15,8 +15,8 @@ import cn.axzo.msg.center.service.pending.request.PendingMessageQueryRequest;
import cn.axzo.msg.center.service.pending.request.PendingMessageStatisticRequest;
import cn.axzo.msg.center.service.pending.response.PendingMessageResponse;
import cn.axzo.msg.center.service.pending.response.PendingMessageStatisticResponse;
import cn.azxo.framework.common.model.CommonResponse;
import cn.axzo.msg.center.service.pending.response.PushPendingMessageDTO;
import cn.azxo.framework.common.model.CommonResponse;
import cn.azxo.framework.common.model.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RestController;

6
inside-notices/src/main/java/cn/axzo/msg/center/message/domain/dto/PendingMessageDTO.java
View File

@ -85,6 +85,10 @@ public class PendingMessageDTO implements Serializable {
* 工作台名称
*/
private String workspaceName;
/**
* 待办发起人的
*/
private Long ouId;
/**
* 业务类型
*/
@ -141,6 +145,7 @@ public class PendingMessageDTO implements Serializable {
.bizFlag(pendingMessageRecord.getBizFlag())
.workspaceId(pendingMessageRecord.getOrgId())
.workspaceName(pendingMessageRecord.getOrgName())
.ouId(pendingMessageRecord.getOuId())
.bizCategory(pendingMessageRecord.getBizCategory())
.deadline(DateFormatUtil.toLocalDateTime(pendingMessageRecord.getDeadline()))
.createTime(DateFormatUtil.toLocalDateTime(pendingMessageRecord.getCreateAt()))
@ -167,6 +172,7 @@ public class PendingMessageDTO implements Serializable {
.bizCategory(this.bizCategory)
.workspaceId(this.workspaceId)
.workspaceName(this.workspaceName)
.ouId(this.ouId)
.createTimestamp(DateFormatUtil.toTimestamp(this.createTime))
.updateTimestamp(DateFormatUtil.toTimestamp(this.updateTime))
.deadlineTimestamp(DateFormatUtil.toTimestamp(this.deadline))

5
inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/PendingMessagePushParam.java
View File

@ -57,6 +57,11 @@ public class PendingMessagePushParam implements Serializable {
// * 消息所属项目部名称
// */
// private String workspaceName;
/**
* 消息所属企业id
*/
private Long ouId;
/**
* 业务类型
*/

1
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -356,6 +356,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
// 多个执行者生成多条record
return param.getExecutor().stream().map(executor -> {
PendingMessageRecord record = new PendingMessageRecord();
record.setOuId(param.getOuId());
record.setIdentityCode(UUIDUtil.uuidString());
record.setRequestNo(requestNo);
record.setState(PendingMessageStateEnum.HAS_BEEN_SENT);

5
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/request/PendingMessagePushRequest.java
View File

@ -51,6 +51,11 @@ public class PendingMessagePushRequest implements Serializable {
*/
@NotNull
private Long workspaceId;
/**
* 消息所属企业id
*/
private Long ouId;
// /**
// * 删除工作台名称,通过id查
// * 消息所属项目部名称

4
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/PendingMessageResponse.java
View File

@ -95,6 +95,10 @@ public class PendingMessageResponse implements Serializable {
* 工作台名称
*/
private String workspaceName;
/**
* 待办发起人的企业id
*/
private Long ouId;
/**
* 业务类型
*/

4
msg-center-domain/src/main/java/cn/axzo/msg/center/domain/entity/PendingMessageRecord.java
View File

@ -92,6 +92,10 @@ public class PendingMessageRecord extends BaseEntityExt<PendingMessageRecord> im
* 消息所属组织名称
*/
private String orgName;
/**
* 消息所属企业ID
*/
private Long ouId;
/**
* 待办状态
*/