1、添加志愿者

2、添加我要帮助

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelVolunteer/controller/TravelVolunteerController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 志愿者表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Api(tags="志愿者表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelVolunteer/entity/TravelVolunteer.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 志愿者表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Data
@@ -35,6 +35,18 @@ public class TravelVolunteer 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 = "志愿者姓名")
@@ -50,5 +62,5 @@ public class TravelVolunteer implements Serializable {
 	/**手机号码*/
 	@Excel(name = "手机号码", width = 15)
     @ApiModelProperty(value = "手机号码")
-    private java.lang.String phone;
+    private java.lang.String volunteerPhone;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelVolunteer/mapper/TravelVolunteerMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 志愿者表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface TravelVolunteerMapper extends BaseMapper<TravelVolunteer> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelVolunteer/service/ITravelVolunteerService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 志愿者表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 public interface ITravelVolunteerService extends IService<TravelVolunteer> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelVolunteer/service/impl/TravelVolunteerServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 志愿者表
  * @Author: jeecg-boot
- * @Date:   2024-09-14
+ * @Date:   2024-09-24
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelVolunteer/vue/TravelVolunteerList.vue

@@ -99,7 +99,6 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import TravelVolunteerModal from './modules/TravelVolunteerModal'
-  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'TravelVolunteerList',
@@ -140,7 +139,7 @@
           {
             title:'手机号码',
             align:"center",
-            dataIndex: 'phone'
+            dataIndex: 'volunteerPhone'
           },
           {
             title: '操作',
@@ -177,9 +176,9 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'volunteerName',text:'志愿者姓名',dictCode:''})
-        fieldList.push({type:'string',value:'cerType',text:'证件类型',dictCode:"travel_certification,cer_name,id"})
+        fieldList.push({type:'string',value:'cerType',text:'证件类型',dictCode:''})
         fieldList.push({type:'string',value:'cerNo',text:'证件号码',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''})
+        fieldList.push({type:'string',value:'volunteerPhone',text:'手机号码',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelVolunteer/vue/modules/TravelVolunteerForm.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="phone">
-              <a-input v-model="model.phone" placeholder="请输入手机号码"  ></a-input>
+            <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="volunteerPhone">
+              <a-input v-model="model.volunteerPhone" placeholder="请输入手机号码"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelVolunteer/vue3/TravelVolunteer.data.ts

@@ -22,7 +22,7 @@ export const columns: BasicColumn[] = [
    {
     title: '手机号码',
     align:"center",
-    dataIndex: 'phone'
+    dataIndex: 'volunteerPhone'
    },
 ];
 //查询数据
@@ -47,7 +47,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     label: '手机号码',
-    field: 'phone',
+    field: 'volunteerPhone',
     component: 'Input',
   },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java

@@ -6,9 +6,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.IndexApiService;
-import org.jeecg.modules.travelAddress.entity.TravelAddress;
-import org.jeecg.modules.travelOrder.entity.TravelOrder;
-import org.jeecg.modules.travelTime.entity.TravelTime;
+import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
+import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -102,19 +101,19 @@ public class IndexApiController {
 
     //无忧租车-链接滴滴打车
 
-    //添加建议
-    @ApiOperation(value="小程序-添加建议", notes="小程序-添加建议")
+    //我要帮助
+    @ApiOperation(value="小程序-我要帮助", notes="添加问题和意见")
     @RequestMapping(value = "/addAdvice", method = {RequestMethod.POST})
-    public Result<?> addAdvice(){
-        return indexApiService.addAdvice();
+    public Result<?> addAdvice(TravelAdvance travelAdvance){
+        return indexApiService.addAdvice(travelAdvance);
     }
 
     /*************************我的***********************************/
     //添加志愿者
     @ApiOperation(value="小程序-添加志愿者", notes="小程序-添加志愿者")
     @RequestMapping(value = "/addVolunteer", method = {RequestMethod.POST})
-    public Result<?> addVolunteer(){
-        return indexApiService.addVolunteer();
+    public Result<?> addVolunteer(TravelVolunteer travelVolunteer){
+        return indexApiService.addVolunteer(travelVolunteer);
     }
 
 

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

@@ -3,8 +3,10 @@ package org.jeecg.modules.apiService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
+import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
 import org.jeecg.modules.travelOrder.entity.TravelOrder;
 import org.jeecg.modules.travelTime.entity.TravelTime;
+import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
 
 public interface IndexApiService {
     //获取小程序任一文章或服务
@@ -88,10 +90,10 @@ public interface IndexApiService {
     //无忧租车-链接滴滴打车
 
     //添加建议
-    public Result<?> addAdvice();
+    public Result<?> addAdvice(TravelAdvance travelAdvance);
 
     /*************************我的***********************************/
     //添加志愿者
-    public Result<?> addVolunteer();
+    public Result<?> addVolunteer(TravelVolunteer travelVolunteer);
 
 }

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

@@ -7,6 +7,8 @@ import org.jeecg.modules.apiService.IndexApiService;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
 import org.jeecg.modules.travelAddress.service.ITravelAddressService;
+import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
+import org.jeecg.modules.travelAdvance.service.ITravelAdvanceService;
 import org.jeecg.modules.travelAmusement.entity.TravelAmusement;
 import org.jeecg.modules.travelAmusement.service.ITravelAmusementService;
 import org.jeecg.modules.travelArea.entity.TravelArea;
@@ -31,6 +33,7 @@ import org.jeecg.modules.travelTime.entity.TravelTime;
 import org.jeecg.modules.travelTime.service.ITravelTimeService;
 import org.jeecg.modules.travelVideo.entity.TravelVideo;
 import org.jeecg.modules.travelVideo.service.ITravelVideoService;
+import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
 import org.jeecg.modules.travelVolunteer.service.ITravelVolunteerService;
 import org.springframework.stereotype.Service;
 
@@ -90,6 +93,14 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Resource
     private ITravelOrderService travelOrderService;
 
+    //建议表
+    @Resource
+    private ITravelAdvanceService travelAdvanceService;
+
+    //志愿者表
+    @Resource
+    private ITravelVolunteerService travelVolunteerService;
+
 
 
 
@@ -97,9 +108,7 @@ public class IndexApiServiceImpl implements IndexApiService {
     //证件表
     @Resource
     private ITravelCertificationService travelCertificationService;
-    //志愿者表
-    @Resource
-    private ITravelVolunteerService travelVolunteerService;
+
 
     //获取轮播图列表
     @Override
@@ -568,15 +577,25 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("订单列表", pageList);
     }
 
-    //添加建议
+    //我要帮助-添加建议
     @Override
-    public Result<?> addAdvice() {
-        return null;
+    public Result<?> addAdvice(TravelAdvance travelAdvance) {
+        boolean flag = travelAdvanceService.save(travelAdvance);
+        if(flag){
+            return Result.OK("新增建议成功！");
+        }else {
+            return Result.OK("新增建议失败！");
+        }
     }
 
     //添加志愿者
     @Override
-    public Result<?> addVolunteer() {
-        return null;
+    public Result<?> addVolunteer(TravelVolunteer travelVolunteer) {
+        boolean flag = travelVolunteerService.save(travelVolunteer);
+        if(flag){
+            return Result.OK("新增志愿者成功！");
+        }else {
+            return Result.OK("新增志愿者失败！");
+        }
     }
 }