diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
index e51aa650..d2d3bd4b 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceSuplierController.java
@@ -42,7 +42,7 @@ public class DmsBaseDeviceSuplierController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(DmsBaseDeviceSuplier dmsBaseDeviceSuplier)
     {
-        startPage();
+//        startPage();
         List<DmsBaseDeviceSuplier> list = dmsBaseDeviceSuplierService.selectDmsBaseDeviceSuplierList(dmsBaseDeviceSuplier);
         return getDataTable(list);
     }
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java
index cdf06b0c..9b49a5f5 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsMobileController.java
@@ -110,7 +110,6 @@ public class DmsMobileController extends BaseController {
                 fileUrls.add(sysFile.getUrl());
             }
         }
-
         dmsBillsFaultInstance.setFileUrls(fileUrls);
         return success(dmsBillsFaultInstanceService.insertDmsBillsFaultInstance(dmsBillsFaultInstance));
     }
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
index 79cfcb4e..33774fd7 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsBillsFaultInstanceServiceImpl.java
@@ -228,6 +228,7 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
         DmsFaultInstanceActivity dmsFaultInstanceActivity;
         if (dmsBillsFaultInstanceActivityList.size() == 1) {
             dmsFaultInstanceActivity = firstStepActivity;
+            dmsBillsFaultInstance.setInstanceActivityId(firstStepActivity.getInstanceActivityId());
         } else {
             dmsFaultInstanceActivity = dmsBillsFaultInstanceActivityList.get(1);
             dmsBillsFaultInstance.setInstanceActivityId(dmsFaultInstanceActivity.getInstanceActivityId());
@@ -236,12 +237,23 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
             DmsFaultInstanceActivity instanceActivity = dmsFaultInstanceActivityMapper.selectDmsFaultInstanceActivityByInstanceActivityId(activity.getInstanceActivityId());
             if (instanceActivity.getProcessActivityId()==1021l){
                 dmsBillsFaultInstance.setCheckedFault(instanceActivity.getCheckedFault());
-            }else {
+                DmsInstanceFile queryInstanceFile = new DmsInstanceFile();
+//        queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
+                queryInstanceFile.setTargetId(activity.getInstanceActivityId());
+                queryInstanceFile.setTargetType("1");
+                List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
+                dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles);
                 dmsBillsFaultInstance.setConfirmTime(instanceActivity.getConfirmTime());
                 dmsBillsFaultInstance.setRepairContent(instanceActivity.getRepairContent());
                 dmsBillsFaultInstance.setProtectedMethod(instanceActivity.getProtectedMethod());
                 dmsBillsFaultInstance.setRepairer(instanceActivity.getRepairer());
                 dmsBillsFaultInstance.setRepairConfirm(instanceActivity.getRepairConfirm());
+                dmsBillsFaultInstance.setProcessHandleResolution(instanceActivity.getProcessHandleResolution());
+                DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
+                queryInstanceFile1.setTargetId(activity.getInstanceActivityId());
+                queryInstanceFile1.setTargetType("2");
+                List<DmsInstanceFile> dmsInstanceFiles1 = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile1);
+                dmsBillsFaultInstance.setDmsInstanceFiles1(dmsInstanceFiles1);
             }
         }
         dmsBillsFaultInstance.setFaultType(dmsFaultInstanceActivity.getFaultType());
@@ -250,19 +262,19 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
         dmsBillsFaultInstance.setDeviceId(dmsFaultInstanceActivity.getDeviceId());
         dmsBillsFaultInstance.setRepairType(dmsFaultInstanceActivity.getRepairType());
         dmsBillsFaultInstance.setOutsrcId(dmsFaultInstanceActivity.getOutsrcId());
-        dmsBillsFaultInstance.setProcessHandleResolution(dmsFaultInstanceActivity.getProcessHandleResolution());
+
 
         dmsBillsFaultInstance.setDmsFaultInstanceActivityList(null);
 
-        DmsInstanceFile queryInstanceFile = new DmsInstanceFile();
-//        queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
-        queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(0).getInstanceActivityId());
-        queryInstanceFile.setTargetType("1");
-        List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
+//        DmsInstanceFile queryInstanceFile = new DmsInstanceFile();
+////        queryInstanceFile.setTargetType(DmsConstants.DMS_INSTANCE_FILE_TARGET_TYPE_FAULT_INSTANCE_ACTIVITY);
+//        queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(0).getInstanceActivityId());
+//        queryInstanceFile.setTargetType("1");
+//        List<DmsInstanceFile> dmsInstanceFiles = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
 //        queryInstanceFile.setTargetId(dmsBillsFaultInstanceActivityList.get(1).getInstanceActivityId());
 //        queryInstanceFile.setTargetType("2");
 //        List<DmsInstanceFile> dmsInstanceFiles1 = dmsInstanceFileMapper.selectDmsInstanceFileList(queryInstanceFile);
-        dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles);
+//        dmsBillsFaultInstance.setDmsInstanceFiles(dmsInstanceFiles);
 //        dmsBillsFaultInstance.setDmsInstanceFiles1(dmsInstanceFiles1);
         return dmsBillsFaultInstance;
     }
@@ -377,8 +389,8 @@ public class DmsBillsFaultInstanceServiceImpl implements IDmsBillsFaultInstanceS
         List<DmsFaultInstanceActivity> list = dmsBillsFaultInstanceMapper.selectFaults(repairInstanceId);
         List<DmsFaultCompentsParts> parts = dmsBillsFaultInstanceMapper.selectParts(repairInstanceId);
         DmsFaultInstanceActivity activity = new DmsFaultInstanceActivity();
-        BeanUtils.copyProperties(list.get(1),activity);
-        activity.setCheckedFault(list.get(0).getCheckedFault());
+        BeanUtils.copyProperties(list.get(0),activity);
+//        activity.setCheckedFault(list.get(0).getCheckedFault());
         activity.setParts(parts);
         return activity;
     }
diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java
index 22b92f0c..9ab7bb20 100644
--- a/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java
+++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/service/impl/DmsFaultInstanceActivityServiceImpl.java
@@ -63,7 +63,7 @@ public class DmsFaultInstanceActivityServiceImpl implements IDmsFaultInstanceAct
         DmsFaultInstanceActivity dmsFaultInstanceActivity2 = dmsFaultInstanceActivities.get(1);
         DmsInstanceFile queryInstanceFile1 = new DmsInstanceFile();
         queryInstanceFile1.setTargetType("2");
-        queryInstanceFile1.setTargetId(dmsFaultInstanceActivity2.getInstanceActivityId());
+        queryInstanceFile1.setTargetId(dmsFaultInstanceActivity1.getInstanceActivityId());
         List<DmsInstanceFile> dmsInstanceFiles2 = dmsInstanceFileMapper.selectDmsInstanceFileConvertList(queryInstanceFile1);
         dmsFaultInstanceActivity2.setDmsInstanceFileList(dmsInstanceFiles2);
         List<DmsFaultInstanceActivity> dmsFaultInstanceActivities1 = new ArrayList<>();
diff --git a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml
index 8b71355b..d058b8fb 100644
--- a/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml
+++ b/hw-modules/hw-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml
@@ -272,6 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             x.fault_description ,
             x.checked_fault ,
+               x.process_handle_resolution,
             x.repair_content ,
             x.protected_method ,
             x.repairer ,