From c14a95916d468d6d21258325162d35760e411b7e Mon Sep 17 00:00:00 2001
From: wu <wsjxh1023@163.com>
Date: Mon, 2 Sep 2024 09:11:07 +0800
Subject: [PATCH] bugfix

---
 src/main/java/com/mudu/entity/ASafeQyjcxx.java   |  2 +-
 .../java/com/mudu/quartz/AcheckTaskQuartz.java   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/mudu/entity/ASafeQyjcxx.java b/src/main/java/com/mudu/entity/ASafeQyjcxx.java
index 3470701..334b298 100644
--- a/src/main/java/com/mudu/entity/ASafeQyjcxx.java
+++ b/src/main/java/com/mudu/entity/ASafeQyjcxx.java
@@ -20,7 +20,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel("实体类")
-@TableName(value = "a_safe_qyjcxx")
+@TableName(value = "a_safe_qyjcxx_md")
 public class ASafeQyjcxx implements Serializable {
 
     private static final long serialVersionUID = -50281110442061251L;
diff --git a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java
index d0539be..7b452c0 100644
--- a/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java
+++ b/src/main/java/com/mudu/quartz/AcheckTaskQuartz.java
@@ -347,7 +347,7 @@ public class AcheckTaskQuartz {
         //更新人员
         aSafeYhzgxx.setGxry(rybh);
         //更新时间
-        aSafeYhzgxx.setGxsj(new Date());
+        aSafeYhzgxx.setGxsj(b.getReportDateTime());
         //记录状态
         aSafeYhzgxx.setJlzt(1);
         aSafeYhzgxxService.save(aSafeYhzgxx);
@@ -427,7 +427,7 @@ public class AcheckTaskQuartz {
         //更新人员
         aSafeXcrwjcxzgxx.setGxry(rybh);
         //更新时间
-        aSafeXcrwjcxzgxx.setGxsj(new Date());
+        aSafeXcrwjcxzgxx.setGxsj(b.getNeedFinalDateTime());
         //记录状态
         aSafeXcrwjcxzgxx.setJlzt(1);
         aSafeXcrwjcxzgxxService.save(aSafeXcrwjcxzgxx);
@@ -549,8 +549,6 @@ public class AcheckTaskQuartz {
         //检查时间
         if (a.getReportDateTime() != null) {
             aSafeXcrw.setJcsj(a.getReportDateTime());
-        } else {
-            aSafeXcrw.setJcsj(null);
         }
         //任务周期
         aSafeXcrw.setZqbh(rwzqUuid);
@@ -561,7 +559,9 @@ public class AcheckTaskQuartz {
         //入库时间
         aSafeXcrw.setRksj(new Date());
         //更新时间
-        aSafeXcrw.setGxsj(new Date());
+        if (a.getReportDateTime() != null) {
+            aSafeXcrw.setGxsj(a.getReportDateTime());
+        }
         //更新人员
         aSafeXcrw.setGxry(a.getRybh());
         //记录状态
@@ -812,7 +812,7 @@ public class AcheckTaskQuartz {
             aSafeZcrwjl.setQyfxdwzbh(fxdwzResponse.getXxbh());
         }
         //是否发现隐患
-        aSafeZcrwjl.setSffxyh(0);
+        aSafeZcrwjl.setSffxyh(1);
         //完成状态
         aSafeZcrwjl.setWczt(1);
         //检查时间
@@ -844,7 +844,7 @@ public class AcheckTaskQuartz {
         //更新人员
         aSafeZcrwjl.setGxry(rybh);
         //更新时间
-        aSafeZcrwjl.setGxsj(new Date());
+        aSafeZcrwjl.setGxsj(b.getAddDateTime());
         // 完成状态
         aSafeZcrwjl.setWczt(1);
         aSafeZcrwjlService.save(aSafeZcrwjl);
@@ -1018,7 +1018,7 @@ public class AcheckTaskQuartz {
         //更新人员
         aSafeYhzgxx.setGxry(a.getRybh());
         //更新时间
-        aSafeYhzgxx.setGxsj(new Date());
+        aSafeYhzgxx.setGxsj(a.getReportDateTime());
         //记录状态
         aSafeYhzgxx.setJlzt(1);
         aSafeYhzgxxService.save(aSafeYhzgxx);