From e1ec365640eefdcb06abb1d73da0d80367f79be3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 06 一月 2025 09:13:25 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
index 84f274d..104c528 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolTaskServiceImpl.java
@@ -94,7 +94,7 @@
.eq(YwPatrolTask::getId,id)
.last(" limit 1 "))
;
- if(Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.TWO) &&
+ if((Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.ZERO) || Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.ONE) ) &&
ywPatrolTask.getEndDate().getTime()<System.currentTimeMillis()){
ywPatrolTask.setStatus(Constants.TWO);
}
@@ -156,8 +156,8 @@
;
IPage<YwPatrolTask> iPage = ywPatrolTaskMapper.selectJoinPage(page,YwPatrolTask.class,queryWrapper);
for (YwPatrolTask ywPatrolTask:iPage.getRecords()) {
- if(Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.TWO) &&
- ywPatrolTask.getEndDate().getTime()<System.currentTimeMillis()){
+ if((Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.ZERO) || Constants.equalsInteger(ywPatrolTask.getStatus(),Constants.ONE) ) &&
+ ywPatrolTask.getEndDate().getTime()<System.currentTimeMillis()){
ywPatrolTask.setStatus(Constants.TWO);
}
}
--
Gitblit v1.9.3