From d5e3cdd20b05c8a1856eafb1e1d022ed9e04200b Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 20 九月 2023 16:05:41 +0800
Subject: [PATCH] 删除整改状态,允许自选验收时间

---
 src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
index 24c379c..3a5a5c3 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiHiddenDangerCheckService.java
@@ -285,18 +285,19 @@
             return ApiResult.errorToken("验证userId,loginName,token,deviceType,deviceId,appType 不一致");
         }
         try {
+            new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
             HiddenDangerCheckPoint hdcp = new ObjectMapper().readValue(str, HiddenDangerCheckPoint.class);
             hdcp.setUpdateBy(header.loginName);
             hdcp.setUpdateTime(DateUtils.getNowDate());
             if (!StringUtils.isEmpty(hdcp.getAcceptResult())) {
                 //验收结果 (0不通过 打回上一级整改阶段  1通过)
                 if ("0".equals(hdcp.getAcceptResult())) {
-                    hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
+                    hdcp.setAcceptCreateTime(hdcp.getAcceptCreateTime());//设置验收时间
                     hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_RECTIFY);//隐患整改阶段(数据进入到隐患整改阶段)
                     hdcp.setRectifyStatus(TrHiddenDangerCheckConstants.RECTIFY_STATUS_NOT_RECTIFY);//整改状态(未整改)
                     hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_NOT_PASS);//验收状态(验收未通过)
                 } else if ("1".equals(hdcp.getAcceptResult())) {
-                    hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
+                    hdcp.setAcceptCreateTime(hdcp.getAcceptCreateTime());//设置验收时间
                     hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过)
                 }
             }

--
Gitblit v1.9.2