diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index eaf5291..5214dfe 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -86,9 +86,9 @@
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
 
-        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
-            appDeviceAdd.setDescription("安装设备");
-        }
+//        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
+//            appDeviceAdd.setDescription("安装设备");
+//        }
         //转换火星坐标系至ws84坐标
         if (ToolUtil.isNotEmpty(appDeviceAdd.getLongitude())
                 && ToolUtil.isNotEmpty(appDeviceAdd.getLatitude())) {

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index eaf5291..5214dfe 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -86,9 +86,9 @@
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
 
-        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
-            appDeviceAdd.setDescription("安装设备");
-        }
+//        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
+//            appDeviceAdd.setDescription("安装设备");
+//        }
         //转换火星坐标系至ws84坐标
         if (ToolUtil.isNotEmpty(appDeviceAdd.getLongitude())
                 && ToolUtil.isNotEmpty(appDeviceAdd.getLatitude())) {
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index 0a6e074..5441b3b 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -55,7 +55,7 @@
 //    }
 
     /**
-     * 获取施工添加设备分页列表
+     * app获取施工添加设备分页列表
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
@@ -219,7 +219,10 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String devcode, String devtype, String begTime, String endTime, String project, String installPerson) {
+    public Object list(String devcode, String devtype,
+                       String begTime, String endTime,
+                       String project, String installPerson,
+                       String wellName, String wellCode) {
         Page<AppDeviceLog> page = new PageFactory<AppDeviceLog>().defaultPage();
         EntityWrapper<AppDeviceLog> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(devcode)) {
@@ -240,6 +243,12 @@
         if (ToolUtil.isNotEmpty(devtype)) {
             query.eq("devicetype", devtype);
         }
+        if (ToolUtil.isNotEmpty(wellName)) {
+            query.like("wellname", wellName);
+        }
+        if (ToolUtil.isNotEmpty(wellCode)) {
+            query.like("wellcode", wellCode);
+        }
         query.orderBy("createtime", false);
         page = appDeviceLogService.selectPage(page, query);
         List<AppDeviceLog> appDeviceLogList = page.getRecords();

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index eaf5291..5214dfe 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -86,9 +86,9 @@
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
 
-        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
-            appDeviceAdd.setDescription("安装设备");
-        }
+//        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
+//            appDeviceAdd.setDescription("安装设备");
+//        }
         //转换火星坐标系至ws84坐标
         if (ToolUtil.isNotEmpty(appDeviceAdd.getLongitude())
                 && ToolUtil.isNotEmpty(appDeviceAdd.getLatitude())) {
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
index 0a6e074..5441b3b 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceLogController.java
@@ -55,7 +55,7 @@
 //    }
 
     /**
-     * 获取施工添加设备分页列表
+     * app获取施工添加设备分页列表
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
@@ -219,7 +219,10 @@
      */
     @RequestMapping(value = "/list")
     @ResponseBody
-    public Object list(String devcode, String devtype, String begTime, String endTime, String project, String installPerson) {
+    public Object list(String devcode, String devtype,
+                       String begTime, String endTime,
+                       String project, String installPerson,
+                       String wellName, String wellCode) {
         Page<AppDeviceLog> page = new PageFactory<AppDeviceLog>().defaultPage();
         EntityWrapper<AppDeviceLog> query = new EntityWrapper<>();
         if (ToolUtil.isNotEmpty(devcode)) {
@@ -240,6 +243,12 @@
         if (ToolUtil.isNotEmpty(devtype)) {
             query.eq("devicetype", devtype);
         }
+        if (ToolUtil.isNotEmpty(wellName)) {
+            query.like("wellname", wellName);
+        }
+        if (ToolUtil.isNotEmpty(wellCode)) {
+            query.like("wellcode", wellCode);
+        }
         query.orderBy("createtime", false);
         page = appDeviceLogService.selectPage(page, query);
         List<AppDeviceLog> appDeviceLogList = page.getRecords();
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
index d070dcb..b5889aa 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/model/AppDeviceAdd.java
@@ -458,7 +458,12 @@
         if (ToolUtil.isNotEmpty(appDeviceLog.getInstalltimeFmt())) {
             appDeviceAdd.installtime = (DateUtil.parseTime(appDeviceLog.getInstalltimeFmt()));
         }
-//        appDeviceAdd.photopath = appDeviceLog.getPhotopath();
+        appDeviceAdd.photopath1 = appDeviceLog.getPhotopath1();
+        appDeviceAdd.photopath2 = appDeviceLog.getPhotopath2();
+        appDeviceAdd.photopath3 = appDeviceLog.getPhotopath3();
+        appDeviceAdd.photopath4 = appDeviceLog.getPhotopath4();
+        appDeviceAdd.photopath5 = appDeviceLog.getPhotopath5();
+        appDeviceAdd.photopath6 = appDeviceLog.getPhotopath6();
         appDeviceAdd.factory = appDeviceLog.getFactory();
         appDeviceAdd.project = appDeviceLog.getProject();
         appDeviceAdd.workmsg = appDeviceLog.getWorkmsg();