优化

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/mobile/GxtMobileOrderController.java

@@ -6,6 +6,7 @@ import com.ygtx.common.core.domain.AjaxResult;
 import com.ygtx.common.core.page.TableDataInfo;
 import com.ygtx.common.enums.BusinessType;
 import com.ygtx.gxt.domain.*;
+import com.ygtx.gxt.service.IGxtOrderMineService;
 import com.ygtx.gxt.service.IGxtOrderScoreService;
 import com.ygtx.gxt.service.IGxtRepairOrderService;
 import com.ygtx.gxt.service.IGxtWorkOrderService;
@@ -44,6 +45,9 @@ public class GxtMobileOrderController extends BaseController
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private IGxtOrderMineService gxtOrderMineService;
+
     /**
      * 查询超时工单列表
      */
@@ -303,4 +307,27 @@ public class GxtMobileOrderController extends BaseController
         }
         return toAjax(result);
     }
+
+    /**
+     * 查询待办工单列表（合并维修工单和维保工单）
+     */
+    @GetMapping("/pendingList")
+    public TableDataInfo pendingList(GxtRepairOrder repairOrder, GxtWorkOrder workOrder, @Param("keyword") String keyword)
+    {
+        // 开启分页插件自动分页
+        startPage();
+        // 对 keyword 进行空格过滤处理
+        if (keyword != null) {
+            keyword = keyword.trim();
+            if (keyword.isEmpty()) {
+                keyword = null; // 视为空，不参与搜索
+            }
+        }
+        repairOrder.getParams().put("keyword", keyword);
+        workOrder.getParams().put("keyword", keyword);
+        // 查询合并的工单列表
+         List<OrderScoreInfo> list = gxtOrderMineService.selectUnionOrderListMyTodo(repairOrder, workOrder);
+        return getDataTable(list);
+    }
+
 }

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtRepairOrder.java

@@ -192,6 +192,7 @@ public class GxtRepairOrder extends BaseEntity
     private Long orderType;
 
     /** 维修方式(1正常维修，2复位启机)*/
+    @Excel(name = "工单状态", readConverterExp = "1=正常维修,2=复位启机")
     private String repairMethod;
     
     /** 复位方式(1远程复位，2就地复位) */

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/OrderScoreInfo.java

@@ -112,6 +112,7 @@ public class OrderScoreInfo {
     private String priorityType;
 
     /** 工作结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date workEndTime;
 
     /** 评分状态（to_self-待自评，to_re-待复评，to_confirm-待确认，to_final-待终评，to_archive-待归档，archived-已归档） */
@@ -181,11 +182,11 @@ public class OrderScoreInfo {
     /** 反馈理由 */
     private String feedbackReason;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date createTime;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date updateTime;
 
     /** 处理时长 */

ygtx-gxt/src/main/resources/mapper/gxt/GxtOrderMineMapper.xml

@@ -112,6 +112,9 @@
                 update_time as update_time
             FROM gxt_repair_order t
             <where>
+                <if test="repairOrder.params.keyword != null and repairOrder.params.keyword != ''">
+                    and (work_order_project_no like concat('%', ${repairOrder.params.keyword}, '%') or pcs_device_name like concat('%', ${repairOrder.params.keyword}, '%'))
+                </if>
                 <if test="repairOrder.workOrderProjectNo != null and repairOrder.workOrderProjectNo != ''"> and work_order_project_no like concat('%', #{repairOrder.workOrderProjectNo}, '%')</if>
                 <if test="repairOrder.workOrderStatus != null and repairOrder.workOrderStatus != ''"> and work_order_status = #{repairOrder.workOrderStatus}</if>
                 <if test="repairOrder.gxtCenterId != null"> and gxt_center_id = #{repairOrder.gxtCenterId}</if>
@@ -193,6 +196,9 @@
                 update_time as update_time
             FROM gxt_work_order t
             <where>
+                <if test="workOrder.params.keyword != null and workOrder.params.keyword != ''">
+                    and (work_order_project_no like concat('%', ${workOrder.params.keyword}, '%') or pcs_device_name like concat('%', ${workOrder.params.keyword}, '%'))
+                </if>
                 <if test="workOrder.workOrderProjectNo != null and workOrder.workOrderProjectNo != ''"> and work_order_project_no like concat('%', #{workOrder.workOrderProjectNo}, '%')</if>
                 <if test="workOrder.workOrderStatus != null and workOrder.workOrderStatus != ''"> and work_order_status = #{workOrder.workOrderStatus}</if>
                 <if test="workOrder.gxtCenterId != null"> and gxt_center_id = #{workOrder.gxtCenterId}</if>

ygtx-ui/src/views/gxt/gxtOrder/index.vue

@@ -2161,13 +2161,13 @@ function submitForm(status) {
       form.value.workOrderStatus = status
       if (form.value.id != undefined) {
         updateGxtOrder(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
+          proxy.$modal.msgSuccess("下发成功")
           open.value = false
           getList()
         })
       } else {
         addGxtOrder(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
+          proxy.$modal.msgSuccess("新建成功")
           open.value = false
           getList()
         })
@@ -2754,8 +2754,8 @@ function onMisInfoSelected(row) {
       }
       form.value.misNo = row.misNo
       form.value.content = row.content
-      // form.value.realStartTime = row.realStartTime
-      // form.value.realEndTime = row.realEndTime
+      form.value.realStartTime = row.realStartTime
+      form.value.realEndTime = row.realEndTime
       form.value.planStartTime = row.planStartTime
       form.value.planEndTime = row.planEndTime
       if (!form.value.pcsDeviceId) {