From 88af52278ad3bf8642682a3ed8d3cdb3b0b9ad0d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 12 十一月 2024 16:58:34 +0800
Subject: [PATCH] 巡检员问题上报逻辑删除接口
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
index 35c8b85..db4830b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java
@@ -30,12 +30,11 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.util.UriComponentsBuilder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -362,6 +361,7 @@
if (comType == 1) {
virtualCard.setInUse((byte) 0);
virtualCard.setIntakeId(null);
+ virtualCard.setOpenTime(null);
} else {
virtualCard.setInUse((byte) 1);
virtualCard.setIntakeId(intakeId);
@@ -384,6 +384,21 @@
if (comType == 1) {
virtualCard.setInUse((byte) 1);
virtualCard.setIntakeId(intakeId);
+
+ // 濡傛灉鏄鍒掑紑闃�锛屼粠鍛戒护鏃ュ織涓幏鍙栬鍒掓椂闂达紝鍚﹀垯鍙栧綋鍓嶆椂闂�
+ if(commandCode.equals(CodeV1.cd_A1) || commandCode.equals(CodeV1.cd_A2)) {
+ // 璁″垝寮�闃�
+ Date openTime = null;
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ try {
+ openTime = sdf.parse(rmCommandHistoryMapper.getTimeByCommId(comId));
+ }catch (ParseException e) {
+ }
+ virtualCard.setOpenTime(openTime);
+ }else {
+ // 闈炶鍒掑紑闃�
+ virtualCard.setOpenTime(new Date());
+ }
} else {
virtualCard.setInUse((byte) 0);
virtualCard.setIntakeId(null);
--
Gitblit v1.8.0