From 535eda6d96f44e0caa6c0fe7f703345c3f6e5558 Mon Sep 17 00:00:00 2001
From: yq183 <645046984@qq.com>
Date: Mon, 17 Mar 2025 18:26:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/business/domain/BusinessTask.java   | 3 ++-
 .../java/org/dromara/business/domain/bo/BusinessTaskBo.java   | 3 ++-
 .../java/org/dromara/business/domain/vo/BusinessTaskVo.java   | 3 ++-
 .../src/main/resources/mapper/business/BusinessTaskMapper.xml | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java
index ccc39b1..7f45208 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessTask.java
@@ -31,8 +31,9 @@ public class BusinessTask extends BaseEntity {
     private Long id;
 
     @TableField(fill = FieldFill.INSERT)
-    private Polygon polygonRegion;
+    private String polygonRegion;
 
+    private String verbalTrick;
     /**
      * 期望完成时间
      */
diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java
index 9c4faa7..482c0a9 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/domain/bo/BusinessTaskBo.java
@@ -32,7 +32,7 @@ public class BusinessTaskBo extends BaseEntity {
     private Long id;
 
     @NotNull(message = "地图不能为空", groups = { EditGroup.class })
-    private Polygon polygonRegion;
+    private String polygonRegion;
 
     /**
      * 工单类型（0:拍照 1：喊话）
@@ -40,6 +40,7 @@ public class BusinessTaskBo extends BaseEntity {
     @NotBlank(message = "工单类型 不能为空", groups = { AddGroup.class, EditGroup.class })
     private String taskType;
 
+    private String verbalTrick;
     /**
      * 期望完成时间
      */
diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java
index 2e0c74e..5620b22 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java
@@ -38,7 +38,7 @@ public class BusinessTaskVo implements Serializable {
     @ExcelProperty(value = "")
     private Long id;
 
-    private Polygon polygonRegion;
+    private String polygonRegion;
 
     /**
      * 工单类型（0:拍照 1：喊话）
@@ -53,6 +53,7 @@ public class BusinessTaskVo implements Serializable {
     @ExcelProperty(value = "期望完成时间")
     private Date expectTime;
 
+    private String verbalTrick;
     /**
      * 说明
      */
diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml
index 7638879..8c2e611 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessTaskMapper.xml
@@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result column="create_dept" property="createDept" />
         <result column="dept_name" property="deptName" />
         <result column="status" property="status" />
+        <result column="polygon_region" property="polygonRegion" />
+        <result column="verbal_trick" property="verbalTrick" />
     </resultMap>
     <select id="distance" resultType="java.lang.Integer">
         SELECT device_id,
@@ -30,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="queryPageList" resultMap="businessTaskMap">
-        select id, task_type, expect_time, demand, complete_time, status ,create_by ,nick_name, create_dept, dept_name
+        select id, task_type,polygon_region ,verbal_trick,expect_time, demand, complete_time, status ,create_by ,nick_name, create_dept, dept_name
         from business_task  t
         <where>
             <if test="bo.taskType != null and bo.taskType != ''">