1、游玩项目添加字段

2、获取地址按时间排序

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/entity/TravelAddress.java

@@ -35,6 +35,18 @@ public class TravelAddress implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
 	/**联系人姓名*/
 	@Excel(name = "联系人姓名", width = 15)
     @ApiModelProperty(value = "联系人姓名")
@@ -47,9 +59,9 @@ public class TravelAddress implements Serializable {
 	@Excel(name = "所属区域", width = 15)
     @ApiModelProperty(value = "所属区域")
     private java.lang.String area;
-	/**详细地址*/
-	@Excel(name = "详细地址", width = 15)
-    @ApiModelProperty(value = "详细地址")
+	/**详细地址 */
+	@Excel(name = "详细地址 ", width = 15)
+    @ApiModelProperty(value = "详细地址 ")
     private java.lang.String address;
 	/**所属用户*/
 	@Excel(name = "所属用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/TravelAddressList.vue

@@ -138,7 +138,7 @@
             dataIndex: 'area'
           },
           {
-            title:'详细地址',
+            title:'详细地址 ',
             align:"center",
             dataIndex: 'address'
           },
@@ -189,7 +189,7 @@
         fieldList.push({type:'string',value:'userName',text:'联系人姓名',dictCode:''})
         fieldList.push({type:'string',value:'userPhone',text:'联系人电话',dictCode:''})
         fieldList.push({type:'string',value:'area',text:'所属区域',dictCode:''})
-        fieldList.push({type:'string',value:'address',text:'详细地址',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'详细地址 ',dictCode:''})
         fieldList.push({type:'string',value:'memberId',text:'所属用户',dictCode:"han_hai_member,nick_name,id"})
         fieldList.push({type:'string',value:'addressDefault',text:'是否为默认地址(0-否 1-是)',dictCode:''})
         this.superFieldList = fieldList

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/modules/TravelAddressForm.vue

@@ -19,8 +19,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
-              <a-input v-model="model.address" placeholder="请输入详细地址"  ></a-input>
+            <a-form-model-item label="详细地址 " :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
+              <a-input v-model="model.address" placeholder="请输入详细地址 "  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue3/TravelAddress.data.ts

@@ -20,7 +20,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'area'
    },
    {
-    title: '详细地址',
+    title: '详细地址 ',
     align:"center",
     dataIndex: 'address'
    },
@@ -56,7 +56,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '详细地址',
+    label: '详细地址 ',
     field: 'address',
     component: 'Input',
   },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/controller/TravelAmusementController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 游玩项目表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Api(tags="游玩项目表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/entity/TravelAmusement.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 游玩项目表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Data
@@ -75,4 +75,12 @@ public class TravelAmusement implements Serializable {
 	@Excel(name = "项目类型(0-遗产路径 1-我要研学)", width = 15)
     @ApiModelProperty(value = "项目类型(0-遗产路径 1-我要研学)")
     private java.lang.String amusementType;
+	/**开放时间*/
+	@Excel(name = "开放时间", width = 15)
+    @ApiModelProperty(value = "开放时间")
+    private java.lang.String openTime;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/mapper/TravelAmusementMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 游玩项目表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface TravelAmusementMapper extends BaseMapper<TravelAmusement> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/ITravelAmusementService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 游玩项目表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface ITravelAmusementService extends IService<TravelAmusement> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/service/impl/TravelAmusementServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 游玩项目表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/vue/TravelAmusementList.vue

@@ -175,6 +175,16 @@
             align:"center",
             dataIndex: 'amusementType'
           },
+          {
+            title:'开放时间',
+            align:"center",
+            dataIndex: 'openTime'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -219,6 +229,8 @@
         fieldList.push({type:'string',value:'amusementStatement',text:'出行说明',dictCode:''})
         fieldList.push({type:'string',value:'isPay',text:'是否付费项目(0-否 1-是)',dictCode:''})
         fieldList.push({type:'string',value:'amusementType',text:'项目类型(0-遗产路径 1-我要研学)',dictCode:''})
+        fieldList.push({type:'string',value:'openTime',text:'开放时间',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/vue/modules/TravelAmusementForm.vue

@@ -53,6 +53,16 @@
               <a-input v-model="model.amusementType" placeholder="请输入项目类型(0-遗产路径 1-我要研学)"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开放时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="openTime">
+              <a-input v-model="model.openTime" placeholder="请输入开放时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAmusement/vue3/TravelAmusement.data.ts

@@ -58,6 +58,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'amusementType'
    },
+   {
+    title: '开放时间',
+    align:"center",
+    dataIndex: 'openTime'
+   },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -116,4 +126,14 @@ export const formSchema: FormSchema[] = [
     field: 'amusementType',
     component: 'Input',
   },
+  {
+    label: '开放时间',
+    field: 'openTime',
+    component: 'Input',
+  },
+  {
+    label: '联系电话',
+    field: 'phone',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/controller/TravelExperienceController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Api(tags="非遗体验表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/entity/TravelExperience.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Data
@@ -51,4 +51,12 @@ public class TravelExperience implements Serializable {
 	@Excel(name = "非遗体验详情", width = 15)
     @ApiModelProperty(value = "非遗体验详情")
     private java.lang.String experienceDetail;
+	/**开放时间*/
+	@Excel(name = "开放时间", width = 15)
+    @ApiModelProperty(value = "开放时间")
+    private java.lang.String openTime;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/mapper/TravelExperienceMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface TravelExperienceMapper extends BaseMapper<TravelExperience> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/ITravelExperienceService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface ITravelExperienceService extends IService<TravelExperience> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/service/impl/TravelExperienceServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 非遗体验表
  * @Author: jeecg-boot
- * @Date:   2024-09-23
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/TravelExperienceList.vue

@@ -143,6 +143,16 @@
             dataIndex: 'experienceDetail',
             scopedSlots: {customRender: 'htmlSlot'}
           },
+          {
+            title:'开放时间',
+            align:"center",
+            dataIndex: 'openTime'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -181,6 +191,8 @@
         fieldList.push({type:'string',value:'experienceImage',text:'非遗体验封面',dictCode:''})
         fieldList.push({type:'string',value:'experienceOpentime',text:'开放时间',dictCode:''})
         fieldList.push({type:'string',value:'experienceDetail',text:'非遗体验详情',dictCode:''})
+        fieldList.push({type:'string',value:'openTime',text:'开放时间',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue/modules/TravelExperienceForm.vue

@@ -23,6 +23,16 @@
               <j-editor v-model="model.experienceDetail" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开放时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="openTime">
+              <a-input v-model="model.openTime" placeholder="请输入开放时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelExperience/vue3/TravelExperience.data.ts

@@ -26,6 +26,16 @@ export const columns: BasicColumn[] = [
     dataIndex: 'experienceDetail',
     slots: { customRender: 'htmlSlot' },
    },
+   {
+    title: '开放时间',
+    align:"center",
+    dataIndex: 'openTime'
+   },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -54,4 +64,14 @@ export const formSchema: FormSchema[] = [
     field: 'experienceDetail',
     component: 'JCodeEditor', //TODO String后缀暂未添加
   },
+  {
+    label: '开放时间',
+    field: 'openTime',
+    component: 'Input',
+  },
+  {
+    label: '联系电话',
+    field: 'phone',
+    component: 'Input',
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/controller/TravelRoleInfoController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-21
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Api(tags="角色信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/entity/TravelRoleInfo.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-21
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Data
@@ -85,4 +85,12 @@ public class TravelRoleInfo implements Serializable {
 	@Excel(name = "提前预约", width = 15)
     @ApiModelProperty(value = "提前预约")
     private java.lang.String adPre;
+	/**开放时间*/
+	@Excel(name = "开放时间", width = 15)
+    @ApiModelProperty(value = "开放时间")
+    private java.lang.String openTime;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private java.lang.String phone;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/mapper/TravelRoleInfoMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-21
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface TravelRoleInfoMapper extends BaseMapper<TravelRoleInfo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/ITravelRoleInfoService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-21
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface ITravelRoleInfoService extends IService<TravelRoleInfo> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/service/impl/TravelRoleInfoServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 角色信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-21
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue/TravelRoleInfoList.vue

@@ -183,6 +183,16 @@
             align:"center",
             dataIndex: 'adPre'
           },
+          {
+            title:'开放时间',
+            align:"center",
+            dataIndex: 'openTime'
+          },
+          {
+            title:'联系电话',
+            align:"center",
+            dataIndex: 'phone'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -229,6 +239,8 @@
         fieldList.push({type:'string',value:'brief',text:'个人简介',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'所属用户',dictCode:"han_hai_member,nick_name,id"})
         fieldList.push({type:'string',value:'adPre',text:'提前预约',dictCode:''})
+        fieldList.push({type:'string',value:'openTime',text:'开放时间',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue/modules/TravelRoleInfoForm.vue

@@ -63,6 +63,16 @@
               <a-input v-model="model.adPre" placeholder="请输入提前预约"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="开放时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="openTime">
+              <a-input v-model="model.openTime" placeholder="请输入开放时间"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入联系电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue3/TravelRoleInfo.data.ts

@@ -65,6 +65,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'adPre'
    },
+   {
+    title: '开放时间',
+    align:"center",
+    dataIndex: 'openTime'
+   },
+   {
+    title: '联系电话',
+    align:"center",
+    dataIndex: 'phone'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -139,4 +149,14 @@ export const formSchema: FormSchema[] = [
     field: 'adPre',
     component: 'Input',
   },
+  {
+    label: '开放时间',
+    field: 'openTime',
+    component: 'Input',
+  },
+  {
+    label: '联系电话',
+    field: 'phone',
+    component: 'Input',
+  },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

@@ -507,10 +507,12 @@ public class IndexApiServiceImpl implements IndexApiService {
             pageList = travelAddressService
                     .lambdaQuery()
                     .eq(TravelAddress::getMemberId,travelAddress.getMemberId())
+                    .orderByDesc(TravelAddress::getCreateTime)
                     .page(page);
         }else {
             pageList = travelAddressService
                     .lambdaQuery()
+                    .orderByDesc(TravelAddress::getCreateTime)
                     .page(page);
         }