diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java
index e2b21c94..b5b1c42b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java
@@ -52,6 +52,9 @@ public class PerformancemstServiceImpl implements PerformancemstService {
         if (ObjectUtil.isNotEmpty(assessor_id)) {
             map.put("assessor_id", "%" + assessor_id + "%");
         }
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        map.put("create_id", "" + currentUserId);
+
         map.put("assessor_date", assessor_date);
         JSONObject json = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.update_time desc");
         return json;
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql
index ecb5ef45..b537dc2d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql
@@ -15,6 +15,7 @@
 	#################################################
 	输入.flag					        TYPEAS s_string
 	输入.assessor_id					    TYPEAS s_string
+	输入.create_id					    TYPEAS s_string
 	输入.assessor_date			        TYPEAS s_string
 	输入.performance_id			        TYPEAS s_string
 	输入.begin_time			            TYPEAS s_string
@@ -70,7 +71,9 @@
                 OPTION 输入.assessor_id <> ""
                     user.nick_name like 输入.assessor_id
                 ENDOPTION
-
+                OPTION 输入.create_id <> ""
+                    mst.assessor_id = 输入.create_id
+                ENDOPTION
                 OPTION 输入.assessor_date <> ""
                     mst.assessor_date = 输入.assessor_date
                 ENDOPTION
@@ -268,4 +271,4 @@
 
 			ENDSELECT
 		ENDQUERY
-	ENDIF
\ No newline at end of file
+	ENDIF
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
index 034599c9..98fbfb31 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairplanmstServiceImpl.java
@@ -76,6 +76,41 @@ public class DevicerepairplanmstServiceImpl implements DevicerepairplanmstServic
             map.put("classIds", classIds);
         }
         JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRPLAN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.create_time DESC");
+        JSONArray ja = json.getJSONArray("content");
+        JSONArray ja2 = new JSONArray();
+        for(int i=0;i<ja.size();i++){
+            JSONObject jo = ja.getJSONObject(i);
+            String plan_start_date = jo.getString("plan_start_date");
+            String real_end_date = jo.getString("real_end_date");
+            String maintenancecycle2 = jo.getString("maintenancecycle");
+            if(StrUtil.isEmpty(real_end_date)){
+                jo.put("next_end_date",plan_start_date);
+                ja2.add(jo);
+            }else{
+                Date real_end_date2 = DateUtil.parse(real_end_date);
+                if(maintenancecycle2.equals("01")){//年
+                    Date next_end_date = DateUtil.offsetMonth(real_end_date2,12);
+                    jo.put("next_end_date",DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                }else if(maintenancecycle2.equals("02")){//季
+                    Date next_end_date = DateUtil.offsetMonth(real_end_date2,3);
+                    jo.put("next_end_date",DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                }else if(maintenancecycle2.equals("03")){//月
+                    Date next_end_date = DateUtil.offsetMonth(real_end_date2,1);
+                    jo.put("next_end_date",DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                }else if(maintenancecycle2.equals("04")){//周
+                    Date next_end_date = DateUtil.offsetWeek(real_end_date2,1);
+                    jo.put("next_end_date",DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                }else{
+                    jo.put("next_end_date","");
+                    ja2.add(jo);
+                }
+            }
+        }
+        json.put("content",ja2);
         return json;
     }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
index bcab027c..d3d2bee8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.data.domain.Pageable;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -78,6 +79,37 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
             map.put("classIds", classIds);
         }
         JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.update_time DESC");
+        JSONArray ja = json.getJSONArray("content");
+        JSONArray ja2 = new JSONArray();
+        for(int i=0;i<ja.size();i++){
+            JSONObject jo = ja.getJSONObject(i);
+            String plan_start_date = jo.getString("plan_start_date");
+            String real_end_date = jo.getString("real_end_date");
+            String maintenancecycle2 = jo.getString("maintenancecycle");
+            if(StrUtil.isEmpty(real_end_date)){
+                jo.put("next_end_date",plan_start_date);
+                ja2.add(jo);
+            }else{
+                Date real_end_date2 = DateUtil.parse(real_end_date);
+                if(maintenancecycle2.equals("01")){//年
+                    Date next_end_date = DateUtil.offsetMonth(real_end_date2,12);
+                    jo.put("next_end_date",DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                }else if(maintenancecycle2.equals("02")){//月
+                    Date next_end_date = DateUtil.offsetMonth(real_end_date2,1);
+                    jo.put("next_end_date",DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                }else if(maintenancecycle2.equals("03")){//周
+                    Date next_end_date = DateUtil.offsetWeek(real_end_date2,1);
+                    jo.put("next_end_date",DateUtil.formatDate(next_end_date));
+                    ja2.add(jo);
+                }else{
+                    jo.put("next_end_date","");
+                    ja2.add(jo);
+                }
+            }
+        }
+        json.put("content",ja2);
         return json;
     }
 
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
index 2f0ea49d..7522e5e0 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
@@ -126,11 +126,12 @@
         <el-table-column fixed="left" prop="device_code" label="设备编号"  min-width="85" />
         <el-table-column fixed="left" prop="device_name" label="设备名称"  min-width="150" />
         <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100"  />
-        <el-table-column fixed="left" prop="maintenancecycle" label="维修周期" :formatter="formatMainName" min-width="70" />
-        <el-table-column fixed="left" prop="repair_type" label="维修类型" :formatter="formatRepairpType" min-width="70" />
-        <el-table-column fixed="left" prop="plan_start_date" label="计划开始日期" min-width="95" />
-        <el-table-column fixed="left" prop="real_start_date" label="实际开始日期" min-width="95" />
-        <el-table-column fixed="left" prop="real_end_date" label="实际结束日期" min-width="95" />
+        <el-table-column fixed="left" prop="maintenancecycle" label="维修周期" :formatter="formatMainName" min-width="75" />
+        <el-table-column fixed="left" prop="repair_type" label="维修类型" :formatter="formatRepairpType" min-width="75" />
+        <el-table-column prop="plan_start_date" label="计划初始日期" min-width="100" />
+        <el-table-column prop="real_start_date" label="最近保养开始日期" min-width="125" />
+        <el-table-column prop="real_end_date" label="最近保养结束日期" min-width="125" />
+        <el-table-column prop="next_end_date" label="下次保养日期" min-width="100" />
         <el-table-column prop="create_name" label="创建人" min-width="90" />
         <el-table-column prop="create_time" label="创建时间" min-width="140" />
         <el-table-column prop="confirm_optname" label="审核人" min-width="90" />
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
index 1688c194..3e3c2316 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
@@ -109,7 +109,7 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column fixed="left" type="selection" min-width="35" />
-        <el-table-column fixed="left" prop="is_active" label="是否启用" min-width="70">
+        <el-table-column fixed="left" prop="is_active" label="是否启用" min-width="75">
           <template slot-scope="scope">
             <el-switch
               :value="format_is_active(scope.row.is_active)"
@@ -125,12 +125,13 @@
         <el-table-column fixed="left" prop="device_code" label="设备编码"  min-width="85"  />
         <el-table-column fixed="left" prop="device_name" label="设备名称"  min-width="150"  />
         <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100"  />
-        <el-table-column fixed="left" prop="maintenancecycle" label="保养周期" :formatter="formatMainName" min-width="70"  />
-        <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70"  />
+        <el-table-column fixed="left" prop="maintenancecycle" label="保养周期" :formatter="formatMainName" min-width="75"  />
+        <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="75"  />
         <el-table-column prop="detail_count" label="明细数" min-width="60"  />
-        <el-table-column prop="plan_start_date" label="计划开始日期" min-width="95" />
-        <el-table-column prop="real_start_date" label="实际开始日期" min-width="95" />
-        <el-table-column prop="real_end_date" label="实际结束日期" min-width="95" />
+        <el-table-column prop="plan_start_date" label="计划初始日期" min-width="100" />
+        <el-table-column prop="real_start_date" label="最近保养开始日期" min-width="125" />
+        <el-table-column prop="real_end_date" label="最近保养结束日期" min-width="125" />
+        <el-table-column prop="next_end_date" label="下次保养日期" min-width="100" />
         <el-table-column prop="create_name" label="创建人" min-width="90" />
         <el-table-column prop="create_time" label="创建时间" min-width="140" />
         <el-table-column prop="confirm_optname" label="审核人" min-width="90" />