调整初始数据

src/main/java/com/lqkj/info/entity/ShiftPersonnel.java

@@ -1,11 +1,14 @@
 package com.lqkj.info.entity;
 
 import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.lqkj.common.annotation.Excel;
 import com.lqkj.common.core.model.BaseEntity;
+import org.springframework.data.annotation.Transient;
 
 /**
  * 轮班人员信息对象 shift_personnel
@@ -41,6 +44,9 @@ public class ShiftPersonnel extends BaseEntity
     /** 备注 */
     private String memo;
 
+    @Transient
+    private LocalTime workTime;
+
     public void setPersonnelId(Integer personnelId) 
     {
         this.personnelId = personnelId;
@@ -68,7 +74,7 @@ public class ShiftPersonnel extends BaseEntity
     {
         return personnelName;
     }
-    public void setStartTime(LocalTime startTime) 
+    public void setStartTime(LocalTime startTime)
     {
         this.startTime = startTime;
     }
@@ -96,6 +102,15 @@ public class ShiftPersonnel extends BaseEntity
         return memo;
     }
 
+    public LocalTime getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(String workTime) {
+
+        this.workTime = LocalTime.parse(workTime, DateTimeFormatter.ofPattern("HH:mm:ss"));;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

src/main/resources/db/migration/V1_7__20241202.sql

@@ -55,20 +55,16 @@ INSERT INTO "public"."equipment_type" ("type_id", "parent_id", "type_name", "cli
 select setval('equipment_type_type_id_seq', (select max(type_id) from equipment_type));
 
 
-INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (1, 0, '人文休闲', 't', 't', '描述', 1, '备注', NULL, NULL);
-INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (2, 0, '人文景观', 't', 't', '人文景观', 2, '人文景观', NULL, NULL);
-INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (3, 0, '历史景点', 't', 't', '历史景点', 0, '历史景点', NULL, NULL);
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (1, 0, '人文休闲', 't', 't', '描述', 1, '备注', NULL, '/profile/upload/2024/12/17/53073aa3-c317-4511-b4cd-f7e4957054cf.png,/profile/upload/2024/12/17/1d4ff4d0-444c-4246-b7a1-0a4e2704cb8e.png');
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (2, 0, '人文景观', 't', 't', '人文景观', 2, '人文景观', NULL, '/profile/upload/2024/12/17/0a023ac8-7c1c-4d4b-a1c2-79acf45768e2.png,/profile/upload/2024/12/17/08a63535-c88b-41c5-9090-a820ea4a2aa0.png');
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (3, 0, '历史景点', 't', 't', '历史景点', 0, '历史景点', NULL, '/profile/upload/2024/12/17/216267af-502a-4cf9-9325-23431d4515f2.png,/profile/upload/2024/12/17/99d961a7-b3ee-4a05-9273-b89bfd6740f0.png');
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (4, 0, '商业广场', 't', 't', NULL, 0, NULL, NULL, '/profile/upload/2024/12/17/0bf42bbe-30d6-4280-acd3-8abe8e5a5546.png,/profile/upload/2024/12/17/9ef47d98-202a-4d8c-ab01-85ad4151a8fb.png');
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (5, 0, '医疗服务', 't', 't', NULL, 0, NULL, NULL, '/profile/upload/2024/12/17/9dec35e2-3c82-4900-a4e1-7e180bbcbdaa.png,/profile/upload/2024/12/17/3af09672-8481-421a-a48e-95699a78d9c5.png');
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (6, 0, '高校', 't', 't', NULL, 0, NULL, NULL, '/profile/upload/2024/12/17/af3207ad-81f0-4d95-b2c6-a3c41c7dc3bd.png,/profile/upload/2024/12/17/5f0147b9-9198-4a1b-9520-ab8572d595b4.png');
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (7, 0, '公园', 't', 't', '公园', 0, NULL, NULL, '/profile/upload/2024/12/17/aa8ccffc-6274-4bb7-a798-f85f292dce95.png,/profile/upload/2024/12/17/a5c2cbaa-676d-4a71-9544-a1fb0b786235.png');
+
 select setval('organization_type_type_id_seq', (select max(type_id) from organization_type));
 
 
-INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (2, 1, NULL, NULL, NULL, '武侯祠', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/3800608a-92cb-4bd3-b63b-008f1eef5b3f.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
-INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (3, 1, NULL, NULL, NULL, '成都锦里', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/53f33589-b044-448b-85b2-9792c25b412b.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
-INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (4, 1, NULL, NULL, NULL, '三义祠', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/e79a0489-fb32-411b-a7bc-4a5d3eb9d587.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
-INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (5, 1, NULL, NULL, NULL, '天府广场', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/888c70ea-db04-4bd1-812b-8cfc137e647f.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
-INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (6, 3, NULL, NULL, NULL, '武侯祠', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/fa5663a9-c217-40e1-8ed8-5c117d8dad73.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
-INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (7, 3, NULL, NULL, NULL, '成都锦里', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/763ea03f-74c4-480c-ab93-9ff94ee1e495.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
-INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (8, 3, NULL, NULL, NULL, '三义祠', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/2fc1e106-99c6-4494-88fc-30bb20e54f60.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
-INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (9, 3, NULL, NULL, NULL, '天府广场', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/7e596486-b5c4-4c85-890a-6aa6f12840f8.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
-select setval('organization_info_organization_id_seq', (select max(organization_id) from organization_info));
 
 

src/main/resources/mapper/info/ShiftPersonnelMapper.xml

@@ -22,8 +22,7 @@
 		<where>
 			<if test="personnelName != null  and personnelName != ''"> and personnel_name like concat('%', #{personnelName}, '%')</if>
 			<if test="parkingId != null "> and parking_id = #{parkingId}</if>
-			<if test="startTime != null "> and start_time like concat('%', #{startTime}, '%')</if>
-			<if test="endTime != null "> and end_time like concat('%', #{endTime}, '%')</if>
+			<if test="workTime != null">and #{workTime} BETWEEN start_time AND end_time</if>
 		</where>
 		order by personnel_id