From c11ab0383ff21c67ba380970a776ff6ae5ca5610 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 26 六月 2026 10:43:31 +0800
Subject: [PATCH] feat: 新增巡检项目

---
 doc/timing_task_add_inspection_project.sql                             |    8 ++++++++
 src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java        |    4 ++++
 src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java            |    4 ++++
 src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java |    3 +++
 4 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/doc/timing_task_add_inspection_project.sql b/doc/timing_task_add_inspection_project.sql
new file mode 100644
index 0000000..7b2f323
--- /dev/null
+++ b/doc/timing_task_add_inspection_project.sql
@@ -0,0 +1,8 @@
+-- 瀹氭椂浠诲姟琛ㄣ�佸贰妫�璁板綍琛ㄦ柊澧炲贰妫�椤圭洰瀛楁
+-- 娣诲姞鏃堕棿: 2026-06-26
+
+ALTER TABLE timing_task
+    ADD COLUMN inspection_project text NULL COMMENT '宸℃椤圭洰' AFTER inspection_location;
+
+ALTER TABLE inspection_task
+    ADD COLUMN inspection_project text NULL COMMENT '宸℃椤圭洰' AFTER remarks;
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
index 84e4608..1f3a3f0 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/InspectionTask.java
@@ -45,6 +45,10 @@
     @Excel(name = "澶囨敞")
     private String remarks;
 
+    @ApiModelProperty(value = "宸℃椤圭洰")
+    @Excel(name = "宸℃椤圭洰")
+    private String inspectionProject;
+
     @ApiModelProperty(value = "浠诲姟鐧昏浜篒D")
     private Long registrantId;
 
diff --git a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
index f9898f9..5059d5a 100644
--- a/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
+++ b/src/main/java/com/ruoyi/inspectiontask/pojo/TimingTask.java
@@ -43,6 +43,10 @@
     @ApiModelProperty(value = "宸℃鍦扮偣")
     private String inspectionLocation;
 
+    @ApiModelProperty(value = "宸℃椤圭洰")
+    @Excel(name = "宸℃椤圭洰")
+    private String inspectionProject;
+
     @ApiModelProperty(value = "棰戞")
     @Excel(name = "棰戞")
     private String frequencyType;
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
index 92e4114..0503970 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/TimingTaskJob.java
@@ -111,7 +111,10 @@
         inspectionTask.setTaskId(timingTask.getTaskId());
         inspectionTask.setInspectorId(timingTask.getInspectorIds());
         inspectionTask.setInspectionLocation(timingTask.getInspectionLocation());
+        inspectionTask.setInspectionProject(timingTask.getInspectionProject());
         inspectionTask.setRemarks(timingTask.getRemarks());
+        inspectionTask.setInspectionAcceptorId(timingTask.getInspectionAcceptorId());
+        inspectionTask.setInspectionAcceptor(timingTask.getInspectionAcceptor());
         inspectionTask.setRegistrantId(timingTask.getRegistrantId());
         inspectionTask.setFrequencyType(timingTask.getFrequencyType());
         inspectionTask.setFrequencyDetail(timingTask.getFrequencyDetail());

--
Gitblit v1.9.3