From bba5c66b71d8f0b493cdacfc0199182cdc101146 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 6 Dec 2021 10:00:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java | 5 +++++ .../com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java | 5 +++++ .../com/epmet/service/impl/StaffPatrolRecordServiceImpl.java | 1 + 3 files changed, 11 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java index d0d3445589..f35134647c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/user/StatsStaffPatrolRecordDailyEntity.java @@ -123,4 +123,9 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity { */ private String latestPatrolStatus; + /** + * 是否手动结束 手动:1，定时任务传参:0 + */ + private Integer isHandEnd; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java index 93edb74930..8eb89400a2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/StatsStaffPatrolRecordDailyEntity.java @@ -123,4 +123,9 @@ public class StatsStaffPatrolRecordDailyEntity extends BaseEpmetEntity { */ private String latestPatrolStatus; + /** + * 是否手动结束 手动:1，定时任务传参:0 + */ + private Integer isHandEnd; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java index 2078d250b7..988ef9a5cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java @@ -222,6 +222,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl Date: Mon, 6 Dec 2021 10:02:59 +0800 Subject: [PATCH 2/2] sql --- .../main/resources/db/migration/V0.0.18__add_is_hand_end.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql new file mode 100644 index 0000000000..609d117f3f --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.18__add_is_hand_end.sql @@ -0,0 +1,2 @@ +alter table staff_patrol_record add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 0 COMMENT '是否手动结束 手动:1，定时任务传参:0'; +alter table stats_staff_patrol_record_daily add column `IS_HAND_END` INT(1) NOT NULL DEFAULT 0 COMMENT '是否手动结束 手动:1，定时任务传参:0'; \ No newline at end of file