入库审批完成第一次

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();

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<String, Object> 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())) {
+            if (s != null && !"".equals(s.toString())) {
-                producedDate = 0L;
+                producedDate = ObjectFormatUtil.toLong(s.toString());
-            } else {
-                producedDate = DateUtil.DateTimeByDayToTimeStamp(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);
     }
 
 

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 date.getTime();
-        return ts;
     }
 
     // 将日期转为时间戳

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<String, String> 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);
 
     }