Merge branch 'main' of http://47.92.113.182:3000/hanshuang/flutter_integrated_whb

lib/http/ApiService.dart

@@ -1270,6 +1270,19 @@ U6Hzm1ninpWeE+awIDAQAB
     );
   }
 
+  /// 删除list
+  static Future<Map<String, dynamic>> removeList() {
+    return HttpManager().request(
+      basePath,
+      '/dictionaries/listSelectTreeByTkiTree?tm=${DateTime.now().millisecondsSinceEpoch.toString()}',
+      method: Method.post,
+      data: {
+        "DICTIONARIES_ID": '60e6481d96e44a5390ff5c347c4d1ffe',
+        "tm": DateTime.now().millisecondsSinceEpoch.toString(),
+      },
+    );
+  }
+
   /// 安全检查被检查单位
   static Future<Map<String, dynamic>> getSafeCheckToUnitList(
     String OUTSOURCED_ID,
@@ -1970,7 +1983,7 @@ U6Hzm1ninpWeE+awIDAQAB
         "USER_ID": SessionService.instance.loginUserId,
         "ISMAIN": 0,
         "ISSUPERVISE": 0,
-        "DEPARTMENT_ID": SessionService.instance.corpinfoId,
+        "DEPARTMENT_ID": SessionService.instance.deptId,
         "TYPE": 'show',
       },
     );
@@ -2457,12 +2470,40 @@ U6Hzm1ninpWeE+awIDAQAB
     String hiddenType3,
       Map data,
   ) {
+
+    print("======>"+{
+      // ...data,
+      "HIDDEN_ID": "",
+      "SOURCE": '1',
+      "HIDDENDESCR": hazardDescription,
+      "HIDDENPART": partDescription,
+      "LATITUDE": latitude,
+      "LONGITUDE": longitude,
+
+      "RECTIFYDESCR": dangerDetail,
+      "RECTIFICATIONDEADLINE": dataTime,
+      "RECTIFICATIONTYPE": type,
+      "RECTIFICATIONOR": responsibleId,
+
+      "HIDDENTYPE": yinHuanTypeIds,
+      "HIDDENLEVEL": hazardLeve,
+      "RECTIFICATIONDEPT": buMenId,
+      "HIDDENFINDDEPT": buMenPDId.isNotEmpty ? buMenPDId : buMenId,
+
+      "CREATOR": SessionService.instance.loginUserId,
+      "HIDDENTYPE_NAME": yinHuanTypeNames,
+      "HIDDENTYPE1": hiddenType1,
+      "HIDDENTYPE2": hiddenType2,
+      "HIDDENTYPE3": hiddenType3,
+      "CORPINFO_ID": SessionService.instance.corpinfoId,
+      "USER_ID": SessionService.instance.loginUserId,
+    }.toString());
     return HttpManager().request(
       basePath,
       '/app/hidden/riskListCheckAppAdd',
       method: Method.post,
       data: {
-        ...data,
+        // ...data,
         "HIDDEN_ID": "",
         "SOURCE": '1',
         "HIDDENDESCR": hazardDescription,
@@ -2491,6 +2532,29 @@ U6Hzm1ninpWeE+awIDAQAB
     );
   }
 
+  /// 提交隐患验收接口
+  static Future<Map<String, dynamic>> addHazardAcceptanceZero(
+      String type,
+      String miaoshu,
+      String dataTime,
+      String id,
+      ) {
+    return HttpManager().request(
+      basePath,
+      '/app/hidden/check',
+      method: Method.post,
+      data: {
+        "ISQUALIFIED": type,
+        "CHECKDESCR": miaoshu,
+        "CHECK_TIME": dataTime,
+        "HIDDEN_ID": id,
+        "CHECKOR": SessionService.instance.loginUserId,
+        "CORPINFO_ID": SessionService.instance.corpinfoId,
+        "USER_ID": SessionService.instance.loginUserId,
+      },
+    );
+  }
+
   /// 提交隐患验收接口
   static Future<Map<String, dynamic>> addHazardAcceptance(
     String type,
@@ -2514,6 +2578,32 @@ U6Hzm1ninpWeE+awIDAQAB
     );
   }
 
+  /// 提交隐患验收接口
+  static Future<Map<String, dynamic>> addHazardAcceptanceTwo(
+      String type,
+      String miaoshu,
+      String dataTime,
+      String id,
+      String hiddendescr,
+      ) {
+    return HttpManager().request(
+      basePath,
+      '/app/customHidden/check',
+      method: Method.post,
+      data: {
+        "ISQUALIFIED": type,
+        "CHECKDESCR": miaoshu,
+        "CHECK_TIME": dataTime,
+        "HIDDEN_ID": id,
+        "CHECKOR": SessionService.instance.loginUserId,
+        "CORPINFO_ID": SessionService.instance.corpinfoId,
+        "USER_ID": SessionService.instance.loginUserId,
+        "HIDDENDESCR":hiddendescr,
+      },
+    );
+  }
+
+
   /// 隐患检查列表
   static Future<Map<String, dynamic>> getHazardInspectionRecordList(
     int currentPage,
@@ -2904,7 +2994,8 @@ U6Hzm1ninpWeE+awIDAQAB
         "HIDDENTYPE": yinHuanTypeIds,
         "HIDDENLEVEL": hazardLeve,
         "RECTIFICATIONDEPT": buMenId,
-        "HIDDENFINDDEPT": buMenPDId.isNotEmpty ? buMenPDId : buMenId,
+        // "HIDDENFINDDEPT": buMenPDId.isNotEmpty ? buMenPDId : buMenId,
+        "HIDDENFINDDEPT":  buMenId,
 
         "CREATOR": SessionService.instance.loginUserId,
         "HIDDENTYPE_NAME": yinHuanTypeNames,