From f3f3cf8cb97f92054563e9fe59977f414c67b220 Mon Sep 17 00:00:00 2001
From: hanyuqing <1106611654@qq.com>
Date: Thu, 11 Sep 2025 21:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gyxtp/src/view/small.vue                           | 12 ++++
 .../web/controller/system/ZhyTaskController.java   |  8 +++
 .../controller/system/ZhyTaskInfoController.java   |  1 +
 .../resources/mapper/system/ZhyTaskInfoMapper.xml  | 10 ++-
 ruoyi-ui/src/api/system/task.js                    |  7 ++
 ruoyi-ui/src/views/system/info/index.vue           | 79 ++++++++++++++--------
 ruoyi-ui/src/views/system/task/index.vue           |  7 +-
 7 files changed, 90 insertions(+), 34 deletions(-)

diff --git a/gyxtp/src/view/small.vue b/gyxtp/src/view/small.vue
index 08b72de..985c5fe 100644
--- a/gyxtp/src/view/small.vue
+++ b/gyxtp/src/view/small.vue
@@ -99,7 +99,9 @@
         <el-table :data="tableData" style="width: 95%;margin-left: 2.5%;height: 97%; background: transparent;" v-if="drawer">
           <el-table-column prop="title" label="文档名称" style="padding-bottom: 2vh;">
             <template #default="scope">
+            <div @click="goArticle(scope.row)" style="cursor: pointer; padding: 8px;">
               {{scope.row.title}}
+            </div>
             </template>
           </el-table-column>
         </el-table>
@@ -348,6 +350,16 @@ export default {
         params: { id: nodeObject.id }
       })
     },
+    goArticle(row){
+      console.log(row.id)
+      this.$router.push({
+        path: '/articleInfo',
+        query: {
+          id: row.id
+        }
+      })
+
+    },
     getColor(type){
       let res = "rgb(227,203,0)"
       if (type=="author"){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java
index 4df1d87..890d38b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskController.java
@@ -47,6 +47,14 @@ public class ZhyTaskController extends BaseController
         return getDataTable(list);
     }
 
+    @PreAuthorize("@ss.hasPermi('system:task:list')")
+    @GetMapping("/getAll")
+    public TableDataInfo getAll(ZhyTask zhyTask)
+    {
+        List<ZhyTask> list = zhyTaskService.selectZhyTaskList(zhyTask);
+        return getDataTable(list);
+    }
+
     /**
      * 导出任务列表
      */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java
index 04e1fa8..874d99c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ZhyTaskInfoController.java
@@ -37,6 +37,7 @@ public class ZhyTaskInfoController extends BaseController
     {
         startPage();
         List<ZhyTaskInfo> list = zhyTaskInfoService.selectZhyTaskInfoList(zhyTaskInfo);
+        System.out.println(list);
         return getDataTable(list);
     }
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/ZhyTaskInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ZhyTaskInfoMapper.xml
index 15534d1..c32c12e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ZhyTaskInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ZhyTaskInfoMapper.xml
@@ -19,12 +19,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectZhyTaskInfoList" parameterType="ZhyTaskInfo" resultMap="ZhyTaskInfoResult">
         <include refid="selectZhyTaskInfoVo"/>
-        <where>  
-            <if test="name1 != null  and name1 != ''"> and name1 = #{name1}</if>
-            <if test="name2 != null  and name2 != ''"> and name2 = #{name2}</if>
+        <where>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="groupId != null "> and group_id = #{groupId}</if>
             <if test="taskId != null "> and task_id = #{taskId}</if>
+            <if test="name1 != null and name1 != ''">
+                AND name1 LIKE CONCAT('%', #{name1}, '%')
+            </if>
+            <if test="name1 != null and name1 != ''">
+                OR name2 LIKE CONCAT('%', #{name1}, '%')
+            </if>
         </where>
     </select>
     
diff --git a/ruoyi-ui/src/api/system/task.js b/ruoyi-ui/src/api/system/task.js
index 4afa714..1389745 100644
--- a/ruoyi-ui/src/api/system/task.js
+++ b/ruoyi-ui/src/api/system/task.js
@@ -8,6 +8,13 @@ export function listTask(query) {
     params: query
   })
 }
+export function getAll(query) {
+  return request({
+    url: '/system/task/getAll',
+    method: 'get',
+    params: query
+  })
+}
 
 // 查询任务详细
 export function getTask(id) {
diff --git a/ruoyi-ui/src/views/system/info/index.vue b/ruoyi-ui/src/views/system/info/index.vue
index 2a782fe..5c5f83c 100644
--- a/ruoyi-ui/src/views/system/info/index.vue
+++ b/ruoyi-ui/src/views/system/info/index.vue
@@ -1,38 +1,48 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="关键词1" prop="name1">
+      <el-form-item label="关键词" prop="name1">
         <el-input
           v-model="queryParams.name1"
-          placeholder="请输入关键词1"
+          placeholder="请输入关键词"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="关键词2" prop="name2">
-        <el-input
-          v-model="queryParams.name2"
-          placeholder="请输入关键词2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="分组id" prop="groupId">
-        <el-input
-          v-model="queryParams.groupId"
-          placeholder="请输入分组id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="任务id" prop="taskId">
-        <el-input
-          v-model="queryParams.taskId"
-          placeholder="请输入任务id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="任务编号" prop="name1">
+        <el-select v-model="queryParams.taskId" placeholder="请选择">
+          <el-option
+            v-for="item in taskList"
+            :key="item.id"
+            :label="'TASK-'+item.id"
+            :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
+<!--      <el-form-item label="关键词2" prop="name2">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.name2"-->
+<!--          placeholder="请输入关键词2"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="分组id" prop="groupId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.groupId"-->
+<!--          placeholder="请输入分组id"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="任务id" prop="taskId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.taskId"-->
+<!--          placeholder="请输入任务id"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -87,8 +97,15 @@
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务id" align="center" prop="taskId" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="任务编号" align="center" prop="taskId" >
+        <template slot-scope="scope">
+          <span>
+            TASK-{{scope.row.taskId}}
+          </span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="任务id" align="center" prop="taskId" />-->
+<!--      <el-table-column label="id" align="center" prop="id" />-->
       <el-table-column label="关键词1" align="center" prop="name1" />
       <el-table-column label="关键词2" align="center" prop="name2" />
       <el-table-column label="状态" align="center" prop="status">
@@ -157,6 +174,7 @@
 <script>
 import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/system/info";
 import {proceed} from "../../../api/doc";
+import {getAll} from "../../../api/system/task";
 
 export default {
   name: "Info",
@@ -194,11 +212,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      taskList:[]
     };
   },
   created() {
     this.getList();
+    getAll().then(res=>{
+      this.taskList=res.rows
+      console.log(this.taskList)
+    })
   },
   methods: {
     /** 查询任务信息列表 */
diff --git a/ruoyi-ui/src/views/system/task/index.vue b/ruoyi-ui/src/views/system/task/index.vue
index 7ae24c7..08f1ffb 100644
--- a/ruoyi-ui/src/views/system/task/index.vue
+++ b/ruoyi-ui/src/views/system/task/index.vue
@@ -55,11 +55,11 @@
 
     <el-table v-loading="loading" :element-loading-text="taskInfoTip.msg" :data="taskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务id" align="center" prop="id" />
-      <el-table-column label="任务编号" align="center" prop="createTime" >
+<!--      <el-table-column label="任务id" align="center" prop="id" />-->
+      <el-table-column label="任务编号" align="center" prop="id" >
         <template slot-scope="scope">
           <span>
-            TASK-{{scope.row.createTime.replace(/[-:\s]/g, '')}}
+            TASK-{{scope.row.id}}
           </span>
         </template>
       </el-table-column>
@@ -78,6 +78,7 @@
           <span v-if="scope.row.status==1">已完成</span>
         </template>
       </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 <!--          <el-button-->