From 31e099131bf66b27c47576b9b79c33258cbd9bc1 Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Wed, 16 Oct 2024 17:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=82=A8=E6=8E=A8=E9=80=81=E5=88=B0?=
 =?UTF-8?q?=E6=99=BA=E6=85=A7=E5=B7=A5=E7=A8=8B=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java    | 4 ++--
 .../src/main/resources/mapper/app/TmTaskMapper.xml            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 78947e7..6617e2f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -1452,7 +1452,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                 intelVO.setManufacturer(0);
                 intelVO.setOperateType("0"); //0:默认新增 1:修改以前推送的数据
                 //intelVO.setSource(2); //1:智慧工程系统  2:第三方数据
-                intelVO.setStatus("15".equals(task.getMaStatus()) ? 0 : 1); //0:有效 1:无效
+                intelVO.setStatus("16".equals(subTask.getMaStatus()) ? 0 : 1); //0:有效 1:无效
                 intelVO.setSpecificationType("123");
                 intelVO.setValidityDate(DateUtils.getDate());
                 //每个设备不同点的设置
@@ -1472,7 +1472,7 @@ public class TmTaskServiceImpl implements TmTaskService {
     private String resultDataHandler(String data) throws Exception {
         JSONObject object = JSONObject.parseObject(data);
         System.err.println(data);
-        String code = object.getString("code");
+        Integer code = Integer.valueOf(object.getString("code"));
         Integer status = BigDecimal.ZERO.intValue();
         if (status.equals(code)) {
             String dataResultString = object.getString("result");
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
index 55c9ea4..37e9f5c 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -1183,6 +1183,7 @@
         mam.out_fac_code as outFacCode,
         mam.this_check_time as thisCheckTime,
         mam.create_time as createTime,
+        mam.ma_status as maStatus,
         mt.type_id,
         mt3.type_name as typeName,
         mt1.intelligent_code as intelligentCode