From a10503173216f205cf685309ee4856124a36789f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 09:28:33 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 5 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java | 1 -
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 9 +++++++++
3 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 5c3e688..b5408ac 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -294,6 +294,11 @@
@TableField(exist = false)
private Integer levelStatus;
+ @ApiModelProperty(value = "涓氬姟瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 ", example = "1")
+ @TableField(exist = false)
+ private Integer businessStatus;
+
+
@ApiModelProperty(value = "鍒涘缓浜哄鍚�", example = "1")
@TableField(exist = false)
private String createMemberName;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
index 2a659c6..1b8b013 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
@@ -25,7 +25,6 @@
private Integer status;
@ApiModelProperty(value = "涓氬姟瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 ", example = "1")
- @ExcelColumn(name="瀹℃牳鐘舵�� 0寰呭鏍� 1瀹℃壒涓� 2瀹℃牳閫氳繃 3瀹℃牳涓嶉�氳繃 4鍙栨秷 ")
private Integer businessStatus;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 316f676..d7ee5e4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1142,6 +1142,15 @@
result.getType(),
memberId)
);
+ if(Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.xfSuccess)
+ || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.xfFail)
+ || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.signin)
+ || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.signout)
+ || Constants.equalsInteger(result.getStatus(),Constants.VisitStatus.invalid)){
+ result.setBusinessStatus(Constants.VisitStatus.pass);
+ }else{
+ result.setBusinessStatus(result.getStatus());
+ }
return result;
}
--
Gitblit v1.9.3