From 08ceae04545519451e9df22694833be6ad11e814 Mon Sep 17 00:00:00 2001
From: lsymicc <e003914@163.com>
Date: Wed, 10 Jun 2026 15:02:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E8=A1=A8=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=A1=A8=E8=81=94=E6=9F=A5=E6=98=BE=E7=A4=BA=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../job/controller/MydoJobController.java     | 12 +++++
 .../com/ruoyi/job/mapper/MydoJobMapper.java   |  3 ++
 .../ruoyi/job/service/IMydoJobService.java    |  2 +
 .../job/service/impl/MydoJobServiceImpl.java  |  4 ++
 .../resources/mapper/job/MydoJobMapper.xml    | 48 +++++++++++++++++++
 ruoyi-ui/src/api/job/mydoJob.js               |  8 ++++
 ruoyi-ui/src/views/job/mydoJob/index.vue      | 28 +++++++----
 7 files changed, 95 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java
index 660505f..689ec7a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java
@@ -56,6 +56,18 @@ public class MydoJobController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询作业信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('job:mydoJob:list')")
+    @GetMapping("/listUnion")
+    public TableDataInfo listUnion(MydoJob mydoJob)
+    {
+        startPage();
+        List<MydoJob> list = mydoJobService.selectMydoJobUnionList(mydoJob);
+        return getDataTable(list);
+    }
+
     /**
      * 导出作业信息列表
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
index 7bde181..ce6b780 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
@@ -119,4 +119,7 @@ public interface MydoJobMapper
      */
     void getTaskNo(HashMap<String, Object> map);
 
+    List<MydoJob> selectMydoJobUnionList(MydoJob mydoJob);
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
index eaea0e5..4773e47 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
@@ -114,4 +114,6 @@ public interface IMydoJobService
      */
     String getTaskNo(String type);
 
+    List<MydoJob> selectMydoJobUnionList(MydoJob mydoJob);
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
index a37f4d6..fce03f0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
@@ -368,5 +368,9 @@ public class MydoJobServiceImpl implements IMydoJobService
         return map.get("v_serial").toString();
     }
 
+    @Override
+    public List<MydoJob> selectMydoJobUnionList(MydoJob mydoJob) {
+        return mydoJobMapper.selectMydoJobUnionList(mydoJob);
+    }
 
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index 786d04d..58e6adb 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -38,6 +38,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select job_id, status, task_no, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, warehouse_id, fault_flag,flag,tray_code,tray_size,wms_task_no from mydo_job_wcs_finish
     </sql>
 
+    <sql id="selectMydoJobUnion">
+        SELECT * FROM (
+                          SELECT
+                              job_id,status,task_no,roadway_id,cargo_space_id,target_roadway_id,target_cargo_space_id,priority,execution_phase,in_or_out,create_time,start_time,finish_time,entrance_id,exit_id,warehouse_id,fault_flag,flag,tray_code,tray_size,wms_task_no,'mydo_job_wcs' AS source_table
+                          FROM mydo_job_wcs
+                          UNION ALL
+                          SELECTjob_id,status,task_no,roadway_id,cargo_space_id,target_roadway_id,target_cargo_space_id,priority,execution_phase,in_or_out,create_time,start_time,finish_time,entrance_id,exit_id,warehouse_id,fault_flag,flag,tray_code,tray_size,wms_task_no,'mydo_job_wcs_finish' AS source_table
+                          FROM mydo_job_wcs_finish
+                      )
+            AS combined_jobs
+        ORDER BY create_time DESC;  -- 按创建时间倒序（最新在前）
+    </sql>
+
+    <select id="selectMydoJobUnionList" parameterType="MydoJob" resultMap="MydoJobResult">
+        <include refid="selectMydoJobUnion"/>
+        <where>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+            <if test="taskNo != null  and taskNo != ''">and task_no = #{taskNo}</if>
+            <if test="roadwayId != null  and roadwayId != ''">and roadway_id = #{roadwayId}</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''">and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="targetRoadwayId != null  and targetRoadwayId != ''">and target_roadway_id = #{targetRoadwayId}
+            </if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''">and target_cargo_space_id =
+                #{targetCargoSpaceId}
+            </if>
+            <if test="priority != null ">and priority = #{priority}</if>
+            <if test="executionPhase != null and executionPhase != ''">and execution_phase = #{executionPhase}</if>
+            <if test="inOrOut != null and inOrOut != ''">and in_or_out = #{inOrOut}</if>
+            <if test="startTime != null and startTime != ''">and start_time = #{startTime}</if>
+            <if test="finishTime != null and finishTime != ''">and finish_time = #{finishTime}</if>
+            <if test="entranceId != null and entranceId != ''">and entrance_id = #{entranceId}</if>
+            <if test="exitId != null and exitId != ''">and exit_id = #{exitId}</if>
+            <if test="warehouseId != null and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
+            <if test="faultFlag != null and faultFlag != ''">and fault_flag = #{faultFlag}</if>
+            <if test="flag != null  and flag != ''">and flag = #{flag}</if>
+            <if test="trayCode != null and trayCode != ''">and tray_code = #{trayCode}</if>
+            <if test="traySize != null and traySize != ''">and traySize = #{tray_size}</if>
+            <if test="epList != null and epList.size() > 0">
+                and entrance_id in
+                <foreach item="item" index="index" collection="epList" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="wmsTaskNo != null and wmsTaskNo != ''">and wms_task_no = #{wmsTaskNo}</if>
+        </where>
+        ORDER BY create_time DESC,finish_time DESC;
+    </select>
+
     <select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">
         <include refid="selectMydoJobVo"/>
         <where>
diff --git a/ruoyi-ui/src/api/job/mydoJob.js b/ruoyi-ui/src/api/job/mydoJob.js
index 49e8d5f..0f8eff7 100644
--- a/ruoyi-ui/src/api/job/mydoJob.js
+++ b/ruoyi-ui/src/api/job/mydoJob.js
@@ -18,6 +18,14 @@ export function listMydoJobFinish(query) {
   })
 }
 
+export function listMydoJobUnion(query) {
+  return request({
+    url: '/job/mydoJob/listUnion',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询作业信息详细
 export function getMydoJob(jobId) {
   return request({
diff --git a/ruoyi-ui/src/views/job/mydoJob/index.vue b/ruoyi-ui/src/views/job/mydoJob/index.vue
index 552bd66..d0c465e 100644
--- a/ruoyi-ui/src/views/job/mydoJob/index.vue
+++ b/ruoyi-ui/src/views/job/mydoJob/index.vue
@@ -217,7 +217,7 @@
 </template>
 
 <script>
-import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish, handFinish, resendTaskToEntrance } from "@/api/job/mydoJob"
+import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob, listMydoJobFinish,listMydoJobUnion, handFinish, resendTaskToEntrance } from "@/api/job/mydoJob"
 
 export default {
   name: "MydoJob",
@@ -284,19 +284,27 @@ export default {
     /** 查询作业信息列表 */
     getList() {
       this.loading = true
-      if (this.queryParams.status === '4' || this.queryParams.status === '5') {
-        listMydoJobFinish(this.queryParams).then(response => {
+      
+      listMydoJobFinish(this.queryParams).then(response => {
           this.mydoJobList = response.rows
           this.total = response.total
           this.loading = false
         })
-      } else {
-        listMydoJob(this.queryParams).then(response => {
-          this.mydoJobList = response.rows
-          this.total = response.total
-          this.loading = false
-        })
-      }
+
+      // if (this.queryParams.status === '4' || this.queryParams.status === '5' 
+      // || this.queryParams.status === '6') {
+      //   listMydoJobFinish(this.queryParams).then(response => {
+      //     this.mydoJobList = response.rows
+      //     this.total = response.total
+      //     this.loading = false
+      //   })
+      // } else {
+      //   listMydoJob(this.queryParams).then(response => {
+      //     this.mydoJobList = response.rows
+      //     this.total = response.total
+      //     this.loading = false
+      //   })
+      // }
 
     },
     // 取消按钮