diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaLogTypeEnum.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaLogTypeEnum.java
index 78e226f8..2bc931f2 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaLogTypeEnum.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/enums/VisaLogTypeEnum.java
@@ -21,7 +21,7 @@ public enum VisaLogTypeEnum {
EDIT_FORM("edit_form", "编辑表单","%s编辑表单","%s编辑表单"),
EDIT_AMOUNT("edit_amount", "编辑金额变化","%s编辑金额变化","原值:金额变化:%s;
新值:金额变化:%s;"),
UPLOAD_FILE("upload_file", "上传附件","%s上传附件","%s上传%d个附件:%s"),
- DELETE_UPLOAD_FILE("delete_upload_file", "删除附件","%s删除附件","%s删除%d个附件:"),
+ DELETE_UPLOAD_FILE("delete_upload_file", "删除附件","%s删除附件","%s删除%d个附件:%s"),
TO_EXECUTE("to_execute", "发起执行","发起执行", "%s发起执行"),
TO_APPRROVE("to_apprrove", "发起审批","发起%s审批", "%s发起%s审批"),
APPROVED_AGRESS("approved_agress", "审批流:某审批人审批通过","%s审批通过", "%s审批通过"),
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/visa/ChangeRecordLogEventHandle.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/visa/ChangeRecordLogEventHandle.java
index 5c1b4362..ccd4d839 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/visa/ChangeRecordLogEventHandle.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/visa/ChangeRecordLogEventHandle.java
@@ -5,6 +5,7 @@ import cn.axzo.framework.rocketmq.EventConsumer;
import cn.axzo.framework.rocketmq.EventHandler;
import cn.axzo.nanopart.visa.api.enums.MQEventEnum;
import cn.axzo.nanopart.visa.server.mq.producer.VisaChangeLogPayload;
+import cn.axzo.nanopart.visa.server.service.ChangeRecordLogService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.stereotype.Component;
@@ -19,9 +20,11 @@ import org.springframework.stereotype.Component;
@AllArgsConstructor
public class ChangeRecordLogEventHandle implements EventHandler, InitializingBean {
private final EventConsumer eventConsumer;
+ private final ChangeRecordLogService changeRecordLogService;
@Override
public void onEvent(Event event, EventConsumer.Context context) {
VisaChangeLogPayload log = event.normalizedData(VisaChangeLogPayload.class);
+ changeRecordLogService.addLog(log.createRecordLogByPayload());
}
@Override
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/producer/VisaChangeLogPayload.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/producer/VisaChangeLogPayload.java
index 3ff07e3c..275f7327 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/producer/VisaChangeLogPayload.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/producer/VisaChangeLogPayload.java
@@ -3,6 +3,7 @@ package cn.axzo.nanopart.visa.server.mq.producer;
import cn.axzo.framework.rocketmq.Event;
import cn.axzo.nanopart.visa.api.enums.MQEventEnum;
import cn.axzo.nanopart.visa.server.domain.ChangeRecordLog;
+import cn.axzo.nanopart.visa.server.utils.Constants;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -30,6 +31,7 @@ public class VisaChangeLogPayload implements Serializable {
private String content;
private Date operateTime;
private Long personId;
+ private Integer orderBy;
public static Event form(ChangeRecordLog log) {
VisaChangeLogPayload payload = VisaChangeLogPayload.builder()
@@ -38,6 +40,7 @@ public class VisaChangeLogPayload implements Serializable {
.title(log.getTitle())
.content(log.getContent())
.personId(log.getCreateBy())
+ .orderBy(Constants.APPROVE_ORDER_BY)
.build();
return Event.builder()
.eventCode(MQEventEnum.VISA_CHANGE_LOG.getEventCode())
@@ -47,4 +50,14 @@ public class VisaChangeLogPayload implements Serializable {
.data(payload)
.build();
}
+
+ public ChangeRecordLog createRecordLogByPayload() {
+ return ChangeRecordLog.builder()
+ .visaId(this.getVisaId())
+ .action(this.getAction())
+ .title(this.getTitle())
+ .content(this.getContent())
+ .orderBy(this.getOrderBy())
+ .build();
+ }
}
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java
index 172765f4..e12c72bc 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordLogServiceImpl.java
@@ -192,7 +192,7 @@ public class ChangeRecordLogServiceImpl extends ServiceImpl [审批到待提报|审批到决策中]
userName = this.buildUserName(param.getPersonId(), param.getOuId(), param.getWorkspaceId());
diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java
index dc8a16c9..ce18aba4 100644
--- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java
+++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/utils/Constants.java
@@ -31,4 +31,9 @@ public class Constants {
*/
public static final Integer CHANGE_STATUS_FILE_ORDER_BY = 5;
+ /**
+ * 审批相关-排序
+ */
+ public static final Integer APPROVE_ORDER_BY = 5;
+
}