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