From 6e2ffa951a5a08366e001a6bdec958eba9abcf99 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 19 Jan 2026 15:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java | 64 +++-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java | 7
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java | 7
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java | 16 +
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java | 100 +++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java | 7
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java | 31 ++
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml | 24 --
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAuditParam.java | 30 ++
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java | 14 +
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java | 3
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java | 15 +
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderAddParam.java | 2
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAddParam.java | 57 +++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java | 7
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml | 81 ++++---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 21 +
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java | 157 ++++++++++++++
18 files changed, 550 insertions(+), 93 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
index e521e73..15f4ce0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/entity/FwDeviceMaintainPlanEntity.java
@@ -19,12 +19,15 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
import java.util.List;
/**
@@ -55,6 +58,19 @@
@ApiModelProperty(value = "计划周期具体值，数组对象[1,2,3]")
@TableField(typeHandler = FastjsonTypeHandler.class)
private List<String> planCycleValue;
+
+ @ApiModelProperty(value = "维护状态（0未维修1已维修）")
+ private Integer maintainStatus;
+
+ @ApiModelProperty(value = "最后维修时间")
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date lastMaintainTime;
+
/**
* 区域编码
*/
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
index 11d9b1f..62d0c4b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
@@ -37,27 +37,6 @@
b.create_time as device_create_time
</sql>
- <sql id="maintainStatusCalculation">
- CASE
- WHEN (
- SELECT COUNT(1)
- FROM ja_fw_device_maintain_record r
- WHERE r.device_id = a.device_id
- AND r.is_deleted = 0
- AND r.maintain_time IS NOT NULL
- AND (
- (a.plan_cycle_type = '1' AND FIND_IN_SET(DATE_FORMAT(r.maintain_time, '%m月%d号'), REPLACE(REPLACE(REPLACE(a.plan_cycle_value, '[', ''), ']', ''), '"', '')) > 0)
- OR (a.plan_cycle_type = '2' AND FIND_IN_SET(DATE_FORMAT(r.maintain_time, '%d号'), REPLACE(REPLACE(REPLACE(a.plan_cycle_value, '[', ''), ']', ''), '"', '')) > 0)
- OR (a.plan_cycle_type = '3' AND FIND_IN_SET(ELT(DAYOFWEEK(r.maintain_time), '星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'), REPLACE(REPLACE(REPLACE(a.plan_cycle_value, '[', ''), ']', ''), '"', '')) > 0)
- )
- ) > 0 THEN '已维护'
- ELSE '未维护'
- END AS maintain_status,
- (SELECT MAX(r.maintain_time) FROM ja_fw_device_maintain_record r WHERE r.device_id = a.device_id AND r.is_deleted = 0) AS last_maintain_time
-
- </sql>
-
-
<select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
select
<include refid="deviceFields"/>,a.*
@@ -75,8 +54,7 @@
<select id="selectFwDeviceMaintainPlanPage" resultMap="fwDeviceMaintainPlanResultMap">
select
- <include refid="deviceFields"/>,a.*,
- <include refid="maintainStatusCalculation"/>
+ <include refid="deviceFields"/>,a.*
from
ja_fw_device_maintain_plan a
left join ja_fw_device b on (a.device_id = b.id)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
index f4fbb3f..30b7795 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/vo/FwDeviceMaintainPlanVO.java
@@ -16,8 +16,10 @@
*/
package org.sxkj.fw.device.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import org.sxkj.system.cache.SysCache;
import java.io.Serializable;
@@ -118,11 +120,17 @@
@ApiModelProperty("入库时间")
private Date createTime;
- @ApiModelProperty(value = "维修状态")
- private String maintainStatus;
+ @ApiModelProperty(value = "维护状态（0未维修1已维修）")
+ private Integer maintainStatus;
@ApiModelProperty(value = "最后维修时间")
- private String lastMaintainTime;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date lastMaintainTime;
@ApiModelProperty(value = "所属部门名称")
public String getBelongDeptName() {
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
index e43c9ab..cfd9910 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdPatrolTaskController.java
@@ -27,11 +27,14 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
+import org.sxkj.gd.workorder.param.GdPatrolTaskAddParam;
+import org.sxkj.gd.workorder.param.GdPatrolTaskAuditParam;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workorder.wrapper.GdPatrolTaskWrapper;
@@ -41,8 +44,11 @@
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.ArrayList;
import java.util.Map;
import java.util.List;
+import java.util.Objects;
import javax.servlet.http.HttpServletResponse;
/**
@@ -72,13 +78,13 @@
/**
* 巡查任务表 分页
*/
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入gdPatrolTask")
- public R<IPage<GdPatrolTaskVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdPatrolTask, Query query) {
- IPage<GdPatrolTaskEntity> pages = gdPatrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(gdPatrolTask, GdPatrolTaskEntity.class));
- return R.data(GdPatrolTaskWrapper.build().pageVO(pages));
- }
+ // @GetMapping("/list")
+ // @ApiOperationSupport(order = 2)
+ // @ApiOperation(value = "分页", notes = "传入gdPatrolTask")
+ // public R<IPage<GdPatrolTaskVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdPatrolTask, Query query) {
+ // IPage<GdPatrolTaskEntity> pages = gdPatrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(gdPatrolTask, GdPatrolTaskEntity.class));
+ // return R.data(GdPatrolTaskWrapper.build().pageVO(pages));
+ // }
/**
* 巡查任务表 自定义分页
@@ -97,29 +103,34 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入gdPatrolTask")
- public R save(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
- return R.status(gdPatrolTaskService.save(gdPatrolTask));
+ public R save(@Valid @RequestBody List<GdPatrolTaskAddParam> gdPatrolTaskList) {
+ List<GdPatrolTaskEntity> taskEntityList = new ArrayList<>();
+ gdPatrolTaskList.forEach(gdPatrolTask -> {
+ GdPatrolTaskEntity gdPatrolTaskEntity = Objects.requireNonNull(BeanUtil.copy(gdPatrolTask, GdPatrolTaskEntity.class));
+ taskEntityList.add(gdPatrolTaskEntity);
+ });
+ return R.status(gdPatrolTaskService.savePatrolTask(taskEntityList));
}
/**
* 巡查任务表 修改
*/
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdPatrolTask")
- public R update(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
- return R.status(gdPatrolTaskService.updateById(gdPatrolTask));
- }
+ // @PostMapping("/update")
+ // @ApiOperationSupport(order = 5)
+ // @ApiOperation(value = "修改", notes = "传入gdPatrolTask")
+ // public R update(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
+ // return R.status(gdPatrolTaskService.updateById(gdPatrolTask));
+ // }
/**
* 巡查任务表 新增或修改
*/
- @PostMapping("/submit")
- @ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入gdPatrolTask")
- public R submit(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
- return R.status(gdPatrolTaskService.saveOrUpdate(gdPatrolTask));
- }
+ // @PostMapping("/submit")
+ // @ApiOperationSupport(order = 6)
+ // @ApiOperation(value = "新增或修改", notes = "传入gdPatrolTask")
+ // public R submit(@Valid @RequestBody GdPatrolTaskEntity gdPatrolTask) {
+ // return R.status(gdPatrolTaskService.saveOrUpdate(gdPatrolTask));
+ // }
/**
* 巡查任务表 删除
@@ -148,4 +159,15 @@
ExcelUtil.export(response, "巡查任务表数据" + DateUtil.time(), "巡查任务表数据表", list, GdPatrolTaskExcel.class);
}
+ /**
+ * 审核巡查任务
+ */
+ @PostMapping("/audit")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "审核巡查任务", notes = "传入审核参数，拒绝时必须填写拒绝原因")
+ public R audit(@Valid @RequestBody GdPatrolTaskAuditParam auditParam) {
+ boolean result = gdPatrolTaskService.auditPatrolTask(auditParam.getId(), auditParam.getAuditStatus(), auditParam.getRejectReason());
+ return R.status(result);
+ }
+
}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
index cdd1285..cf4ad84 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdWorkOrderController.java
@@ -32,7 +32,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
-import org.sxkj.gd.workorder.param.WorkOrderParam;
+import org.sxkj.gd.workorder.param.WorkOrderAddParam;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
@@ -79,7 +80,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdWorkOrder")
- public R<IPage<GdWorkOrderVO>> page(GdWorkOrderVO gdWorkOrder, Query query) {
+ public R<IPage<GdWorkOrderVO>> page(WorkOrderPageParam gdWorkOrder, Query query) {
IPage<GdWorkOrderVO> pages = gdWorkOrderService.selectGdWorkOrderPage(Condition.getPage(query), gdWorkOrder);
return R.data(pages);
}
@@ -90,7 +91,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入gdWorkOrder")
- public R save(@Valid @RequestBody WorkOrderParam workOrderParam) {
+ public R save(@Valid @RequestBody WorkOrderAddParam workOrderParam) {
return R.status(gdWorkOrderService.saveWorkOrder(workOrderParam));
}
//
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java
new file mode 100644
index 0000000..ca222e3
--- /dev/null
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/enums/PatrolTaskStatusEnum.java
@@ -0,0 +1,100 @@
+package org.sxkj.gd.workorder.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 巡查任务状态枚举
+ * 用于标识巡查任务的不同状态
+ *
+ * @author BladeX
+ * @date 2026-01-19
+ */
+@Getter
+@AllArgsConstructor
+public enum PatrolTaskStatusEnum {
+
+ /**
+ * 待签收
+ */
+ PENDING_SIGNING("0", "待签收"),
+
+ /**
+ * 拒绝签收
+ */
+ REJECTED_SIGNING("1", "拒绝签收"),
+
+ /**
+ * 已撤回
+ */
+ WITHDRAWN("2", "已撤回"),
+
+ /**
+ * 待审核
+ */
+ PENDING_AUDIT("3", "待审核"),
+
+ /**
+ * 审核驳回
+ */
+ AUDIT_REJECTED("4", "审核驳回"),
+
+ /**
+ * 审核通过
+ */
+ AUDIT_PASSED("5", "审核通过"),
+
+ /**
+ * 待验收
+ */
+ PENDING_ACCEPTANCE("6", "待验收"),
+
+ /**
+ * 拒绝验收
+ */
+ REJECTED_ACCEPTANCE("7", "拒绝验收"),
+
+ /**
+ * 验收通过
+ */
+ ACCEPTANCE_PASSED("8", "验收通过");
+
+ /**
+ * 枚举值，对应数据库存储值
+ */
+ @EnumValue
+ private final String value;
+
+ /**
+ * 枚举描述，用于展示
+ */
+ @JsonValue
+ private final String desc;
+
+ /**
+ * 根据值获取对应的枚举
+ *
+ * @param value 枚举值
+ * @return 对应的枚举，如果未找到则返回null
+ */
+ public static PatrolTaskStatusEnum getByValue(String value) {
+ for (PatrolTaskStatusEnum status : values()) {
+ if (status.getValue().equals(value)) {
+ return status;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 判断值是否为有效的巡查任务状态
+ *
+ * @param value 待验证的值
+ * @return 是否有效
+ */
+ public static boolean isValidValue(String value) {
+ return getByValue(value) != null;
+ }
+}
\ No newline at end of file
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
index 8c009ac..d9706b7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -26,7 +26,26 @@
<select id="selectGdPatrolTaskPage" resultMap="gdPatrolTaskResultMap">
- select * from ja_gd_patrol_task where is_deleted = 0
+ select pt.*, wo.work_order_name
+ from ja_gd_patrol_task pt
+ left join ja_gd_work_order wo on pt.work_order_id = wo.id
+ <where>
+ <if test="param2.workOrderId != null and param2.workOrderId != ''">
+ and pt.work_order_id = #{param2.workOrderId}
+ </if>
+ <if test="param2.patrolTaskName != null and param2.patrolTaskName != ''">
+ and pt.patrol_task_name like concat(#{param2.patrolTaskName},'%')
+ </if>
+ <if test="param2.patrolTaskType != null and param2.patrolTaskType != ''">
+ and pt.patrol_task_type = #{param2.patrolTaskType}
+ </if>
+ <if test="param2.taskStatus != null and param2.taskStatus != ''">
+ and pt.task_status = #{param2.taskStatus}
+ </if>
+ <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != '' ">
+ and pt.execute_time BETWEEN #{param2.startTime} AND #{param2.endTime}
+ </if>
+ </where>
</select>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java
index 014708a..8bd6ea4 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.java
@@ -17,6 +17,7 @@
package org.sxkj.gd.workorder.mapper;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@
* @param gdWorkOrder
* @return
*/
- List<GdWorkOrderVO> selectGdWorkOrderPage(IPage page, GdWorkOrderVO gdWorkOrder);
+ List<GdWorkOrderVO> selectGdWorkOrderPage(IPage page, WorkOrderPageParam gdWorkOrder);
/**
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
index 0856fdd..43507fe 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
@@ -28,52 +28,65 @@
<select id="selectGdWorkOrderPage" resultMap="gdWorkOrderResultMap">
- select * from ja_gd_work_order where is_deleted = 0
+ select * from ja_gd_work_order
+ <where>
+ <if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
+ and work_order_status like concat(#{param2.workOrderStatus},'%')
+ </if>
+ <if test="param2.workOrderName != null and param2.workOrderName != ''">
+ and work_order_name like concat('%',#{param2.workOrderName},'%')
+ </if>
+ <if test="param2.workOrderType != null and param2.workOrderType != ''">
+ and work_order_type = #{param2.workOrderType}
+ </if>
+ <if test="param2.createUser != null and param2.createUser != ''">
+ and create_user = #{param2.createUser}
+ </if>
+
+ </where>
</select>
<select id="exportGdWorkOrder" resultType="org.sxkj.gd.workorder.excel.GdWorkOrderExcel">
- SELECT * FROM ja_gd_work_order ${ew.customSqlSegment}
+ SELECT *
+ FROM ja_gd_work_order ${ew.customSqlSegment}
</select>
<!-- 自定义插入语句，使用ST_GeomFromText处理几何数据 -->
<insert id="insert" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
- INSERT INTO ja_gd_work_order (
- id, work_order_name, work_order_code, work_order_type,
- device_load_demand, recommend_device_ids, work_order_status,
- execute_start_time, execute_end_time, service_party,
- geom, remark, area_code,
- create_user, create_dept, create_time,
- update_user, update_time, status, is_deleted
- ) VALUES (
- #{id}, #{workOrderName}, #{workOrderCode}, #{workOrderType},
- #{deviceLoadDemand}, #{recommendDeviceIds}, #{workOrderStatus},
- #{executeStartTime}, #{executeEndTime}, #{serviceParty},
- ST_GeomFromText(#{geom}), #{remark}, #{areaCode},
- #{createUser}, #{createDept}, #{createTime},
- #{updateUser}, #{updateTime}, #{status}, #{isDeleted}
- )
+ INSERT INTO ja_gd_work_order (id, work_order_name, work_order_code, work_order_type,
+ device_load_demand, recommend_device_ids, work_order_status,
+ execute_start_time, execute_end_time, service_party,
+ geom, remark, area_code,
+ create_user, create_dept, create_time,
+ update_user, update_time, status, is_deleted)
+ VALUES (#{id}, #{workOrderName}, #{workOrderCode}, #{workOrderType},
+ #{deviceLoadDemand}, #{recommendDeviceIds}, #{workOrderStatus},
+ #{executeStartTime}, #{executeEndTime}, #{serviceParty},
+ ST_GeomFromText(#{geom}), #{remark}, #{areaCode},
+ #{createUser}, #{createDept}, #{createTime},
+ #{updateUser}, #{updateTime}, #{status}, #{isDeleted})
</insert>
<!-- 自定义更新语句，使用ST_GeomFromText处理几何数据 -->
<update id="updateById" parameterType="org.sxkj.gd.workorder.entity.GdWorkOrderEntity">
- UPDATE ja_gd_work_order SET
- work_order_name = #{workOrderName},
- work_order_code = #{workOrderCode},
- work_order_type = #{workOrderType},
- device_load_demand = #{deviceLoadDemand},
- recommend_device_ids = #{recommendDeviceIds},
- work_order_status = #{workOrderStatus},
- execute_start_time = #{executeStartTime},
- execute_end_time = #{executeEndTime},
- service_party = #{serviceParty},
- geom = ST_GeomFromText(#{geom}),
- remark = #{remark},
- area_code = #{areaCode},
- update_user = #{updateUser},
- update_time = #{updateTime},
- status = #{status},
- is_deleted = #{isDeleted}
+ UPDATE ja_gd_work_order
+ SET work_order_name = #{workOrderName},
+ work_order_code = #{workOrderCode},
+ work_order_type = #{workOrderType},
+ device_load_demand = #{deviceLoadDemand},
+ recommend_device_ids = #{recommendDeviceIds},
+ work_order_status = #{workOrderStatus},
+ execute_start_time = #{executeStartTime},
+ execute_end_time = #{executeEndTime},
+ service_party = #{serviceParty},
+ geom = ST_GeomFromText(#{geom}),
+ remark = #{remark},
+ area_code = #{areaCode},
+ update_user = #{updateUser},
+ update_time = #{updateTime},
+ status = #{status},
+ is_deleted = #{isDeleted}
WHERE id = #{id}
</update>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAddParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAddParam.java
new file mode 100644
index 0000000..8139ed1
--- /dev/null
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAddParam.java
@@ -0,0 +1,57 @@
+package org.sxkj.gd.workorder.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GdPatrolTaskAddParam {
+ /**
+ * 关联工单任务表ID
+ */
+ @ApiModelProperty(value = "关联工单任务表ID")
+ private Long workOrderId;
+ /**
+ * 巡查任务名称
+ */
+ @ApiModelProperty(value = "巡查任务名称")
+ private String patrolTaskName;
+ /**
+ * 巡查任务类型（巡查类/安检类等）
+ */
+ @ApiModelProperty(value = "巡查任务类型（巡查类/安检类等）")
+ private String patrolTaskType;
+ /**
+ * 执行时间
+ */
+ @ApiModelProperty(value = "执行时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date executeTime;
+ /**
+ * 巡查任务航线URL
+ */
+ @ApiModelProperty(value = "巡查任务航线URL")
+ private String patrolRouteUrl;
+ /**
+ * 推荐飞手名称
+ */
+ @ApiModelProperty(value = "推荐飞手名称")
+ private String recommendFlyerName;
+ /**
+ * 关联设备ID
+ */
+ @ApiModelProperty(value = "关联设备ID")
+ private Long deviceId;
+ /**
+ * 任务描述
+ */
+ @ApiModelProperty(value = "任务描述")
+ private String taskDesc;
+ /**
+ * 状态：0草稿、1待签收、2拒绝签收、3待审核
+ */
+ @ApiModelProperty(value = "状态：0草稿、1待签收、2拒绝签收、3待审核")
+ private Byte taskStatus;
+}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAuditParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAuditParam.java
new file mode 100644
index 0000000..40bf51f
--- /dev/null
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/GdPatrolTaskAuditParam.java
@@ -0,0 +1,30 @@
+package org.sxkj.gd.workorder.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class GdPatrolTaskAuditParam {
+ /**
+ * 任务ID
+ */
+ @ApiModelProperty(value = "任务ID", required = true)
+ @NotNull(message = "任务ID不能为空")
+ private Long id;
+
+ /**
+ * 审核状态：4审核通过、5审核拒绝
+ */
+ @ApiModelProperty(value = "审核状态：4审核通过、5审核拒绝", required = true)
+ @NotNull(message = "审核状态不能为空")
+ private String auditStatus;
+
+ /**
+ * 拒绝原因（审核拒绝时必填）
+ */
+ @ApiModelProperty(value = "拒绝原因（审核拒绝时必填）")
+ private String rejectReason;
+}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderAddParam.java
similarity index 98%
rename from drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderParam.java
rename to drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderAddParam.java
index 5f2bdf0..e3223ed 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderParam.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderAddParam.java
@@ -8,7 +8,7 @@
import java.util.Date;
@Data
-public class WorkOrderParam {
+public class WorkOrderAddParam {
@ApiModelProperty(value = "id")
private Long id;
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java
new file mode 100644
index 0000000..de3770d
--- /dev/null
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/param/WorkOrderPageParam.java
@@ -0,0 +1,31 @@
+package org.sxkj.gd.workorder.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class WorkOrderPageParam {
+
+ /**
+ * 工单名称
+ */
+ @ApiModelProperty(value = "工单名称")
+ @NotNull
+ private String workOrderName;
+
+ /**
+ * 工单类型（巡查类/安检类等）
+ */
+ @ApiModelProperty(value = "工单类型（1.巡查类/2.安检类等）")
+ @NotNull
+ private String workOrderType;
+
+ @ApiModelProperty(value = "工单状态：0草稿、10发布中_接单中、11发布中_拒绝接单、20响应中_待拆分、21响应中_申请取消、22响应中_申请修改、23响应中_已取消、30执行中_待全部完成、31执行中_协商修改、40完成待验_待全部验收、50验收通过_待结算、60结算完成_已结算")
+ @NotNull
+ private String workOrderStatus;
+
+ @ApiModelProperty(value = "创建人")
+ private Long createUser;
+}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java
index 9a7ab4f..5e945dd 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdPatrolTaskService.java
@@ -49,4 +49,19 @@
*/
List<GdPatrolTaskExcel> exportGdPatrolTask(Wrapper<GdPatrolTaskEntity> queryWrapper);
+ /**
+ * 批量保存或更新
+ * @param taskEntityList
+ * @return
+ */
+ boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList);
+
+ /**
+ * 审核巡查任务
+ * @param id 任务ID
+ * @param auditStatus 审核状态：4审核通过、5审核拒绝
+ * @param rejectReason 拒绝原因（审核拒绝时必填）
+ * @return
+ */
+ boolean auditPatrolTask(Long id, String auditStatus, String rejectReason);
}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java
index bfd7d50..54c1b5e 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/IGdWorkOrderService.java
@@ -18,7 +18,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
-import org.sxkj.gd.workorder.param.WorkOrderParam;
+import org.sxkj.gd.workorder.param.WorkOrderAddParam;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
import org.sxkj.gd.workorder.vo.GdWorkOrderVO;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
@@ -42,7 +43,7 @@
* @param gdWorkOrder
* @return
*/
- IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, GdWorkOrderVO gdWorkOrder);
+ IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder);
/**
@@ -58,7 +59,7 @@
* @param workOrderParam
* @return
*/
- boolean saveWorkOrder(@Valid WorkOrderParam workOrderParam);
+ boolean saveWorkOrder(@Valid WorkOrderAddParam workOrderParam);
/**
* 处理工单状态变更（接单或拒接接单）
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
index 8daf5c8..e6e6846 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java
@@ -16,7 +16,15 @@
*/
package org.sxkj.gd.workorder.service.impl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
+import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
+import org.sxkj.gd.workorder.enums.PatrolTaskStatusEnum;
+import org.sxkj.gd.workorder.enums.WorkOrderStatusEnum;
+import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
+import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.workorder.excel.GdPatrolTaskExcel;
import org.sxkj.gd.workorder.mapper.GdPatrolTaskMapper;
@@ -25,6 +33,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+
+import java.util.Date;
import java.util.List;
/**
@@ -35,6 +45,9 @@
*/
@Service
public class GdPatrolTaskServiceImpl extends BaseServiceImpl<GdPatrolTaskMapper, GdPatrolTaskEntity> implements IGdPatrolTaskService {
+
+ @Autowired
+ private IGdWorkOrderFlowService gdWorkOrderFlowService;
@Override
public IPage<GdPatrolTaskVO> selectGdPatrolTaskPage(IPage<GdPatrolTaskVO> page, GdPatrolTaskVO gdPatrolTask) {
@@ -51,4 +64,148 @@
return gdPatrolTaskList;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean savePatrolTask(List<GdPatrolTaskEntity> taskEntityList) {
+ // 更新流程节点
+ for (GdPatrolTaskEntity gdPatrolTaskEntity : taskEntityList) {
+ // 保存巡逻任务
+ boolean save = save(gdPatrolTaskEntity);
+ if (!save) {
+ // 任务保存失败，抛出异常触发回滚
+ throw new RuntimeException("保存巡逻任务失败：" + gdPatrolTaskEntity.toString());
+ }
+
+ // 保存流转记录
+ GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
+ gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
+ gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
+ gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getDesc());
+ gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
+ gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
+ gdWorkOrderFlowEntity.setAreaCode(gdPatrolTaskEntity.getAreaCode());
+ gdWorkOrderFlowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+ boolean save1 = gdWorkOrderFlowService.save(gdWorkOrderFlowEntity);
+ if (!save1) {
+ // 流转记录保存失败，抛出异常触发回滚
+ throw new RuntimeException("保存流转记录失败：" + gdWorkOrderFlowEntity.toString());
+ }
+ }
+
+ // 所有任务和流转记录都保存成功
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean auditPatrolTask(Long id, String auditStatus, String rejectReason) {
+ // 1. 获取巡查任务
+ GdPatrolTaskEntity task = getById(id);
+ if (task == null) {
+ throw new RuntimeException("巡查任务不存在");
+ }
+
+ // 2. 检查任务状态是否为待审核
+ if (!PatrolTaskStatusEnum.PENDING_AUDIT.getValue().equals(task.getTaskStatus().toString())) {
+ throw new RuntimeException("任务当前状态无法审核");
+ }
+
+ // 3. 如果审核拒绝，检查拒绝原因是否为空
+ if (PatrolTaskStatusEnum.REJECTED_SIGNING.getValue().equals(auditStatus) && (rejectReason == null || rejectReason.trim().isEmpty())) {
+ throw new RuntimeException("拒绝签收时必须填写拒绝原因");
+ }
+
+ // 4. 检查其他需要拒绝原因的状态
+ if ((PatrolTaskStatusEnum.AUDIT_REJECTED.getValue().equals(auditStatus) || PatrolTaskStatusEnum.REJECTED_ACCEPTANCE.getValue().equals(auditStatus)) && (rejectReason == null || rejectReason.trim().isEmpty())) {
+ throw new RuntimeException("审核驳回或拒绝验收时必须填写拒绝原因");
+ }
+
+ // 4. 更新任务状态
+ task.setTaskStatus(Byte.valueOf(auditStatus));
+ boolean updateResult = updateById(task);
+ if (!updateResult) {
+ throw new RuntimeException("更新任务状态失败");
+ }
+
+ // 5. 保存流转记录
+ GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
+ flowEntity.setCreateUser(AuthUtil.getUserId());
+ flowEntity.setWorkOrderId(id);
+
+ // 设置流转名称和描述
+ String[] flowInfo = buildFlowInfo(auditStatus, rejectReason);
+ String flowName = flowInfo[0];
+ String flowDesc = AuthUtil.getUserName() + " " + org.springblade.core.tool.utils.DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + flowInfo[1];
+
+ flowEntity.setFlowName(flowName);
+ flowEntity.setFlowDesc(flowDesc);
+ flowEntity.setOperator(AuthUtil.getUserName());
+ flowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
+ flowEntity.setAreaCode(task.getAreaCode());
+ flowEntity.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
+
+ boolean saveFlowResult = gdWorkOrderFlowService.save(flowEntity);
+ if (!saveFlowResult) {
+ throw new RuntimeException("保存流转记录失败");
+ }
+
+ return true;
+ }
+
+ /**
+ * 构建流转信息
+ * @param status 状态值
+ * @param rejectReason 拒绝原因
+ * @return 包含流转名称和描述的数组 [flowName, flowDescSuffix]
+ */
+ private String[] buildFlowInfo(String status, String rejectReason) {
+ String flowName;
+ String flowDescSuffix;
+
+ switch (status) {
+ case "0":
+ flowName = PatrolTaskStatusEnum.PENDING_SIGNING.getDesc();
+ flowDescSuffix = " 待签收";
+ break;
+ case "1":
+ flowName = PatrolTaskStatusEnum.REJECTED_SIGNING.getDesc();
+ flowDescSuffix = " 拒绝签收：" + rejectReason;
+ break;
+ case "2":
+ flowName = PatrolTaskStatusEnum.WITHDRAWN.getDesc();
+ flowDescSuffix = " 已撤回";
+ break;
+ case "3":
+ flowName = PatrolTaskStatusEnum.PENDING_AUDIT.getDesc();
+ flowDescSuffix = " 待审核";
+ break;
+ case "4":
+ flowName = PatrolTaskStatusEnum.AUDIT_REJECTED.getDesc();
+ flowDescSuffix = " 审核驳回：" + rejectReason;
+ break;
+ case "5":
+ flowName = PatrolTaskStatusEnum.AUDIT_PASSED.getDesc();
+ flowDescSuffix = " 审核通过";
+ break;
+ case "6":
+ flowName = PatrolTaskStatusEnum.PENDING_ACCEPTANCE.getDesc();
+ flowDescSuffix = " 待验收";
+ break;
+ case "7":
+ flowName = PatrolTaskStatusEnum.REJECTED_ACCEPTANCE.getDesc();
+ flowDescSuffix = " 拒绝验收：" + rejectReason;
+ break;
+ case "8":
+ flowName = PatrolTaskStatusEnum.ACCEPTANCE_PASSED.getDesc();
+ flowDescSuffix = " 验收通过";
+ break;
+ default:
+ flowName = "未知状态";
+ flowDescSuffix = " 未知状态";
+ break;
+ }
+
+ return new String[]{flowName, flowDescSuffix};
+ }
}
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
index 26e0092..a9f098b 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdWorkOrderServiceImpl.java
@@ -35,7 +35,8 @@
import org.sxkj.gd.workorder.enums.WorkOrderTypeEnum;
import org.sxkj.gd.workorder.excel.GdWorkOrderExcel;
import org.sxkj.gd.workorder.mapper.GdWorkOrderMapper;
-import org.sxkj.gd.workorder.param.WorkOrderParam;
+import org.sxkj.gd.workorder.param.WorkOrderAddParam;
+import org.sxkj.gd.workorder.param.WorkOrderPageParam;
import org.sxkj.gd.workorder.param.WorkOrderStatusParam;
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.service.IGdWorkOrderService;
@@ -58,7 +59,7 @@
private IGdWorkOrderFlowService gdWorkOrderFlowService;
@Override
- public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, GdWorkOrderVO gdWorkOrder) {
+ public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
return page.setRecords(baseMapper.selectGdWorkOrderPage(page, gdWorkOrder));
}
@@ -79,7 +80,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean saveWorkOrder(WorkOrderParam workOrderParam) {
+ public boolean saveWorkOrder(WorkOrderAddParam workOrderParam) {
GdWorkOrderEntity entity = Objects.requireNonNull(BeanUtil.copy(workOrderParam, GdWorkOrderEntity.class));
// 验证并格式化几何数据
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
index 6ee836e..fd488f1 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/vo/GdPatrolTaskVO.java
@@ -16,6 +16,7 @@
*/
package org.sxkj.gd.workorder.vo;
+import io.swagger.annotations.ApiModelProperty;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -31,4 +32,10 @@
public class GdPatrolTaskVO extends GdPatrolTaskEntity {
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "开始时间")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ private String endTime;
+
}
--
Gitblit v1.9.3