From 6dfdcd444c43ea0950a306216d51a9d5fdad1765 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 22 Feb 2023 10:05:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=AE=A1=E6=89=B9=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=AC=AC=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QyWxOperationController.java | 1 + .../impl/DepositoryRecordServiceImpl.java | 10 ++++++---- .../depository_manage/utils/DateUtil.java | 3 +-- .../depository_manage/TestOther.java | 20 +++++++++++++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java index d9fb4817..7e7e2e1e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java @@ -694,6 +694,7 @@ public class QyWxOperationController { @Override public void run() { + depositoryRecordService.reviewByQyWxApprovalIn(mainId, finalApprovalInfo_details,crypt,spStatus,spNo); } }).start(); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 813486e0..a79264fd 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -135,6 +135,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { producedDate = DateUtil.DateTimeByDayToTimeStamp(s.toString()); } map.put("producedDate", producedDate); + if(producedDate == 0L){ + map.remove("producedDate"); + } } Map param = new HashMap<>(); param.put("depositoryId", depositoryId); @@ -712,10 +715,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (map.containsKey("producedDate")) { long producedDate = 0L; Object s = map.get("producedDate"); - if (s == null || "".equals(s.toString())) { - producedDate = 0L; - } else { - producedDate = DateUtil.DateTimeByDayToTimeStamp(s.toString()); + if (s != null && !"".equals(s.toString())) { + producedDate = ObjectFormatUtil.toLong(s.toString()); insertProducedDate.put("producedDate", producedDate); } } @@ -2162,6 +2163,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { map.put("id", sid); depositoryRecordMapper.updateApplicationInRecord(map); } + redisTemplate.delete(spNo); } diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java index dfc36f15..202eb0cf 100644 --- a/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java +++ b/src/main/java/com/dreamchaser/depository_manage/utils/DateUtil.java @@ -91,8 +91,7 @@ public class DateUtil { } catch (ParseException e) { throw new RuntimeException(e); } - long ts = date.getTime(); - return ts; + return date.getTime(); } // 将日期转为时间戳 diff --git a/src/test/java/com/dreamchaser/depository_manage/TestOther.java b/src/test/java/com/dreamchaser/depository_manage/TestOther.java index 575831b5..71f96c54 100644 --- a/src/test/java/com/dreamchaser/depository_manage/TestOther.java +++ b/src/test/java/com/dreamchaser/depository_manage/TestOther.java @@ -1,6 +1,9 @@ package com.dreamchaser.depository_manage; +import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; +import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver; +import com.dreamchaser.depository_manage.service.DepositoryRecordService; import com.dreamchaser.depository_manage.utils.ObjectFormatUtil; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; @@ -12,7 +15,9 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; import org.apache.commons.lang.StringUtils; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.test.context.junit4.SpringRunner; import javax.imageio.ImageIO; @@ -30,9 +35,24 @@ import java.util.Map; public class TestOther { + @Autowired + DepositoryRecordService depositoryRecordService; + + @Autowired + RedisTemplate redisTemplate; + @Test public void Test() throws IOException { + String mainId = (String) redisTemplate.opsForHash().get("202302220008", "mainId"); + ApprovalInfo_Details finalApprovalInfo_details = new ApprovalInfo_Details(); + ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver(); + approver.setUserId("PangFuZhen"); + finalApprovalInfo_details.setApprover(approver); + String spNo = "202302220008"; + String crypt = "4dc6ed4606a02bb4df643536b80cc48b"; + String spStatus = "2"; + depositoryRecordService.reviewByQyWxApprovalIn(mainId, finalApprovalInfo_details,crypt,spStatus,spNo); }