1、接口添加

README.md

@@ -1,3 +1,3 @@
 # carrent-admin
 
-环卫车小程序后台代码
+老环卫后台代码

admin-hanhai-vue/.env

@@ -1,5 +1,5 @@
 NODE_ENV=production
-VUE_APP_PLATFORM_NAME=环卫车小程序
+VUE_APP_PLATFORM_NAME=老环卫
 # 开启单点登录
 VUE_APP_SSO=false
 # 开启微应用模式

admin-hanhai-vue/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8000/carrent-admin-api/
+VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-hanhai-vue/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8000/carrent-admin-api/
+VUE_APP_API_BASE_URL=http://localhost:8003/carrent-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

admin-hanhai-vue/public/index.html

@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>环卫车小程序</title>
+  <title>老环卫</title>
 <!--  <link rel="icon" href="<%= BASE_URL %>logo.png">-->
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <style>
@@ -249,7 +249,7 @@
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 环卫车小程序,请耐心等待
+    <div class="load_title">正在加载 老环卫,请耐心等待
 
     </div>
   </div>

admin-hanhai-vue/src/components/layouts/TabLayout.vue

@@ -177,7 +177,7 @@
 
       // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
       changeTitle(title) {
-        let projectTitle = "环卫车小程序"
+        let projectTitle = "老环卫"
         // 首页特殊处理
         if (this.$route.path === indexKey) {
           document.title = projectTitle

admin-hanhai-vue/src/components/layouts/UserLayout.vue

@@ -5,7 +5,7 @@
         <div class="header">
           <a href="/">
 
-            <span class="title">环卫车小程序</span>
+            <span class="title">老环卫</span>
           </a>
         </div>
 <!--        <div class="desc">-->

admin-hanhai-vue/src/components/page/GlobalHeader.vue

@@ -17,8 +17,8 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 环卫车小程序</span>
-      <span v-else>环卫车小程序</span>
+      <span v-if="device === 'desktop'">欢迎进入 老环卫</span>
+      <span v-else>老环卫</span>
 
       <user-menu :theme="theme"/>
     </div>

admin-hanhai-vue/src/components/tools/Logo.vue

@@ -21,7 +21,7 @@
     props: {
       title: {
         type: String,
-        default: '环卫车小程序',
+        default: '老环卫',
         required: false
       },
       showTitle: {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/controller/CarrentCarController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 车辆信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Api(tags="车辆信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/entity/CarrentCar.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 车辆信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Data
@@ -51,48 +51,68 @@ public class CarrentCar implements Serializable {
 	@Excel(name = "车辆名称", width = 15)
     @ApiModelProperty(value = "车辆名称")
     private java.lang.String name;
-	/**车辆图片*/
-	@Excel(name = "车辆图片", width = 15)
-    @ApiModelProperty(value = "车辆图片")
-    private java.lang.String image;
 	/**车辆价格*/
 	@Excel(name = "车辆价格", width = 15)
     @ApiModelProperty(value = "车辆价格")
     private java.math.BigDecimal price;
-	/**车辆公里数*/
-	@Excel(name = "车辆公里数", width = 15)
-    @ApiModelProperty(value = "车辆公里数")
+	/**浏览量*/
+	@Excel(name = "浏览量", width = 15)
+    @ApiModelProperty(value = "浏览量")
+    private java.lang.Integer views;
+	/**品牌*/
+	@Excel(name = "品牌", width = 15)
+    @ApiModelProperty(value = "品牌")
+    private java.lang.String brand;
+	/**时间*/
+	@Excel(name = "时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "时间")
+    private java.util.Date carTime;
+	/**公里数*/
+	@Excel(name = "公里数", width = 15)
+    @ApiModelProperty(value = "公里数")
     private java.lang.Integer mileage;
-	/**车辆类型*/
-	@Excel(name = "车辆类型", width = 15)
-    @ApiModelProperty(value = "车辆类型")
-    private java.lang.String type;
-	/**车辆标签*/
-	@Excel(name = "车辆标签", width = 15)
-    @ApiModelProperty(value = "车辆标签")
-    private java.lang.String tag;
-	/**服务*/
-	@Excel(name = "服务", width = 15)
-    @ApiModelProperty(value = "服务")
-    private java.lang.String services;
-	/**材质*/
-	@Excel(name = "材质", width = 15)
-    @ApiModelProperty(value = "材质")
-    private java.lang.String material;
-	/**尺寸*/
-	@Excel(name = "尺寸", width = 15)
-    @ApiModelProperty(value = "尺寸")
-    private java.lang.String size;
-	/**商品库存*/
-	@Excel(name = "商品库存", width = 15)
-    @ApiModelProperty(value = "商品库存")
+	/**型号*/
+	@Excel(name = "型号", width = 15)
+    @ApiModelProperty(value = "型号")
+    private java.lang.String model;
+	/**车辆库存*/
+	@Excel(name = "车辆库存", width = 15)
+    @ApiModelProperty(value = "车辆库存")
     private java.lang.Integer inventory;
-	/**已售商品数量*/
-	@Excel(name = "已售商品数量", width = 15)
-    @ApiModelProperty(value = "已售商品数量")
-    private java.lang.Integer saleNumber;
-	/**商品详情*/
-	@Excel(name = "商品详情", width = 15)
-    @ApiModelProperty(value = "商品详情")
+	/**车辆详情*/
+	@Excel(name = "车辆详情", width = 15)
+    @ApiModelProperty(value = "车辆详情")
     private java.lang.String detail;
+	/**车辆图片(前)*/
+	@Excel(name = "车辆图片(前)", width = 15)
+    @ApiModelProperty(value = "车辆图片(前)")
+    private java.lang.String imageFront;
+	/**车辆照片(后)*/
+	@Excel(name = "车辆照片(后)", width = 15)
+    @ApiModelProperty(value = "车辆照片(后)")
+    private java.lang.String imageBack;
+	/**车辆照片(左)*/
+	@Excel(name = "车辆照片(左)", width = 15)
+    @ApiModelProperty(value = "车辆照片(左)")
+    private java.lang.String imageLeft;
+	/**车辆照片(右)*/
+	@Excel(name = "车辆照片(右)", width = 15)
+    @ApiModelProperty(value = "车辆照片(右)")
+    private java.lang.String imageRight;
+	/**车辆照片(驾驶室)*/
+	@Excel(name = "车辆照片(驾驶室)", width = 15)
+    @ApiModelProperty(value = "车辆照片(驾驶室)")
+    private java.lang.String imageCab;
+	/**关联车辆类型id*/
+	@Excel(name = "关联车辆类型id", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "carrent_type", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联车辆类型id")
+    private java.lang.String typeId;
+	/**关联车辆分类id*/
+	@Excel(name = "关联车辆分类id", width = 15, dictTable = "carrent_category", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "carrent_category", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联车辆分类id")
+    private java.lang.String categoryId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/mapper/CarrentCarMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 车辆信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 public interface CarrentCarMapper extends BaseMapper<CarrentCar> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/ICarrentCarService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 车辆信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 public interface ICarrentCarService extends IService<CarrentCar> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/service/impl/CarrentCarServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 车辆信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/CarrentCarList.vue

@@ -99,6 +99,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import CarrentCarModal from './modules/CarrentCarModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 
   export default {
     name: 'CarrentCarList',
@@ -127,59 +128,87 @@
             dataIndex: 'name'
           },
           {
-            title:'车辆图片',
+            title:'车辆价格',
             align:"center",
-            dataIndex: 'image'
+            dataIndex: 'price'
           },
           {
-            title:'车辆价格',
+            title:'浏览量',
             align:"center",
-            dataIndex: 'price'
+            dataIndex: 'views'
+          },
+          {
+            title:'品牌',
+            align:"center",
+            dataIndex: 'brand'
+          },
+          {
+            title:'时间',
+            align:"center",
+            dataIndex: 'carTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
           },
           {
-            title:'车辆公里数',
+            title:'公里数',
             align:"center",
             dataIndex: 'mileage'
           },
           {
-            title:'车辆类型',
+            title:'型号',
             align:"center",
-            dataIndex: 'type'
+            dataIndex: 'model'
           },
           {
-            title:'车辆标签',
+            title:'车辆库存',
             align:"center",
-            dataIndex: 'tag'
+            dataIndex: 'inventory'
           },
           {
-            title:'服务',
+            title:'车辆详情',
             align:"center",
-            dataIndex: 'services'
+            dataIndex: 'detail'
           },
           {
-            title:'材质',
+            title:'车辆图片(前)',
             align:"center",
-            dataIndex: 'material'
+            dataIndex: 'imageFront',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'尺寸',
+            title:'车辆照片(后)',
             align:"center",
-            dataIndex: 'size'
+            dataIndex: 'imageBack',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'商品库存',
+            title:'车辆照片(左)',
             align:"center",
-            dataIndex: 'inventory'
+            dataIndex: 'imageLeft',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'已售商品数量',
+            title:'车辆照片(右)',
             align:"center",
-            dataIndex: 'saleNumber'
+            dataIndex: 'imageRight',
+            scopedSlots: {customRender: 'imgSlot'}
           },
           {
-            title:'商品详情',
+            title:'车辆照片(驾驶室)',
             align:"center",
-            dataIndex: 'detail'
+            dataIndex: 'imageCab',
+            scopedSlots: {customRender: 'imgSlot'}
+          },
+          {
+            title:'关联车辆类型id',
+            align:"center",
+            dataIndex: 'typeId_dictText'
+          },
+          {
+            title:'关联车辆分类id',
+            align:"center",
+            dataIndex: 'categoryId_dictText'
           },
           {
             title: '操作',
@@ -216,17 +245,21 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'name',text:'车辆名称',dictCode:''})
-        fieldList.push({type:'string',value:'image',text:'车辆图片',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'车辆价格',dictCode:''})
-        fieldList.push({type:'int',value:'mileage',text:'车辆公里数',dictCode:''})
-        fieldList.push({type:'string',value:'type',text:'车辆类型',dictCode:''})
-        fieldList.push({type:'string',value:'tag',text:'车辆标签',dictCode:''})
-        fieldList.push({type:'string',value:'services',text:'服务',dictCode:''})
-        fieldList.push({type:'string',value:'material',text:'材质',dictCode:''})
-        fieldList.push({type:'string',value:'size',text:'尺寸',dictCode:''})
-        fieldList.push({type:'int',value:'inventory',text:'商品库存',dictCode:''})
-        fieldList.push({type:'int',value:'saleNumber',text:'已售商品数量',dictCode:''})
-        fieldList.push({type:'Text',value:'detail',text:'商品详情',dictCode:''})
+        fieldList.push({type:'int',value:'views',text:'浏览量',dictCode:''})
+        fieldList.push({type:'string',value:'brand',text:'品牌',dictCode:''})
+        fieldList.push({type:'date',value:'carTime',text:'时间'})
+        fieldList.push({type:'int',value:'mileage',text:'公里数',dictCode:''})
+        fieldList.push({type:'string',value:'model',text:'型号',dictCode:''})
+        fieldList.push({type:'int',value:'inventory',text:'车辆库存',dictCode:''})
+        fieldList.push({type:'Text',value:'detail',text:'车辆详情',dictCode:''})
+        fieldList.push({type:'string',value:'imageFront',text:'车辆图片(前)',dictCode:''})
+        fieldList.push({type:'string',value:'imageBack',text:'车辆照片(后)',dictCode:''})
+        fieldList.push({type:'string',value:'imageLeft',text:'车辆照片(左)',dictCode:''})
+        fieldList.push({type:'string',value:'imageRight',text:'车辆照片(右)',dictCode:''})
+        fieldList.push({type:'string',value:'imageCab',text:'车辆照片(驾驶室)',dictCode:''})
+        fieldList.push({type:'string',value:'typeId',text:'关联车辆类型id',dictCode:"carrent_type,name,id"})
+        fieldList.push({type:'string',value:'categoryId',text:'关联车辆分类id',dictCode:"carrent_category,name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue/modules/CarrentCarForm.vue

@@ -9,58 +9,78 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
-              <a-input v-model="model.image" placeholder="请输入车辆图片"  ></a-input>
+            <a-form-model-item label="车辆价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入车辆价格" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
-              <a-input-number v-model="model.price" placeholder="请输入车辆价格" style="width: 100%" />
+            <a-form-model-item label="浏览量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="views">
+              <a-input-number v-model="model.views" placeholder="请输入浏览量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
+              <a-input v-model="model.brand" placeholder="请输入品牌"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="carTime">
+              <j-date placeholder="请选择时间" v-model="model.carTime"  style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="公里数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mileage">
+              <a-input-number v-model="model.mileage" placeholder="请输入公里数" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="model">
+              <a-input v-model="model.model" placeholder="请输入型号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆公里数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mileage">
-              <a-input-number v-model="model.mileage" placeholder="请输入车辆公里数" style="width: 100%" />
+            <a-form-model-item label="车辆库存" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventory">
+              <a-input-number v-model="model.inventory" placeholder="请输入车辆库存" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
-              <a-input v-model="model.type" placeholder="请输入车辆类型"  ></a-input>
+            <a-form-model-item label="车辆详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
+              <a-input v-model="model.detail" placeholder="请输入车辆详情"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="车辆标签" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tag">
-              <a-input v-model="model.tag" placeholder="请输入车辆标签"  ></a-input>
+            <a-form-model-item label="车辆图片(前)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageFront">
+              <j-image-upload isMultiple  v-model="model.imageFront" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="服务" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="services">
-              <a-input v-model="model.services" placeholder="请输入服务"  ></a-input>
+            <a-form-model-item label="车辆照片(后)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageBack">
+              <j-image-upload isMultiple  v-model="model.imageBack" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
-              <a-input v-model="model.material" placeholder="请输入材质"  ></a-input>
+            <a-form-model-item label="车辆照片(左)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageLeft">
+              <j-image-upload isMultiple  v-model="model.imageLeft" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="size">
-              <a-input v-model="model.size" placeholder="请输入尺寸"  ></a-input>
+            <a-form-model-item label="车辆照片(右)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageRight">
+              <j-image-upload isMultiple  v-model="model.imageRight" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="商品库存" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inventory">
-              <a-input-number v-model="model.inventory" placeholder="请输入商品库存" style="width: 100%" />
+            <a-form-model-item label="车辆照片(驾驶室)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageCab">
+              <j-image-upload isMultiple  v-model="model.imageCab" ></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="已售商品数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="saleNumber">
-              <a-input-number v-model="model.saleNumber" placeholder="请输入已售商品数量" style="width: 100%" />
+            <a-form-model-item label="关联车辆类型id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">
+              <j-dict-select-tag type="list" v-model="model.typeId" dictCode="carrent_type,name,id" placeholder="请选择关联车辆类型id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="商品详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="detail">
-              <a-input v-model="model.detail" placeholder="请输入商品详情"  ></a-input>
+            <a-form-model-item label="关联车辆分类id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
+              <j-dict-select-tag type="list" v-model="model.categoryId" dictCode="carrent_category,name,id" placeholder="请选择关联车辆分类id" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCar/vue3/CarrentCar.data.ts

@@ -10,59 +10,87 @@ export const columns: BasicColumn[] = [
     dataIndex: 'name'
    },
    {
-    title: '车辆图片',
+    title: '车辆价格',
     align:"center",
-    dataIndex: 'image'
+    dataIndex: 'price'
    },
    {
-    title: '车辆价格',
+    title: '浏览量',
     align:"center",
-    dataIndex: 'price'
+    dataIndex: 'views'
+   },
+   {
+    title: '品牌',
+    align:"center",
+    dataIndex: 'brand'
+   },
+   {
+    title: '时间',
+    align:"center",
+    dataIndex: 'carTime',
+    customRender:({text}) =>{
+      return !text?"":(text.length>10?text.substr(0,10):text)
+    },
    },
    {
-    title: '车辆公里数',
+    title: '公里数',
     align:"center",
     dataIndex: 'mileage'
    },
    {
-    title: '车辆类型',
+    title: '型号',
     align:"center",
-    dataIndex: 'type'
+    dataIndex: 'model'
    },
    {
-    title: '车辆标签',
+    title: '车辆库存',
     align:"center",
-    dataIndex: 'tag'
+    dataIndex: 'inventory'
    },
    {
-    title: '服务',
+    title: '车辆详情',
     align:"center",
-    dataIndex: 'services'
+    dataIndex: 'detail'
    },
    {
-    title: '材质',
+    title: '车辆图片(前)',
     align:"center",
-    dataIndex: 'material'
+    dataIndex: 'imageFront',
+    customRender:render.renderAvatar,
    },
    {
-    title: '尺寸',
+    title: '车辆照片(后)',
     align:"center",
-    dataIndex: 'size'
+    dataIndex: 'imageBack',
+    customRender:render.renderAvatar,
    },
    {
-    title: '商品库存',
+    title: '车辆照片(左)',
     align:"center",
-    dataIndex: 'inventory'
+    dataIndex: 'imageLeft',
+    customRender:render.renderAvatar,
    },
    {
-    title: '已售商品数量',
+    title: '车辆照片(右)',
     align:"center",
-    dataIndex: 'saleNumber'
+    dataIndex: 'imageRight',
+    customRender:render.renderAvatar,
    },
    {
-    title: '商品详情',
+    title: '车辆照片(驾驶室)',
     align:"center",
-    dataIndex: 'detail'
+    dataIndex: 'imageCab',
+    customRender:render.renderAvatar,
+   },
+   {
+    title: '关联车辆类型id',
+    align:"center",
+    dataIndex: 'typeId_dictText'
+   },
+   {
+    title: '关联车辆分类id',
+    align:"center",
+    dataIndex: 'categoryId_dictText'
    },
 ];
 //查询数据
@@ -75,59 +103,95 @@ export const formSchema: FormSchema[] = [
     field: 'name',
     component: 'Input',
   },
-  {
-    label: '车辆图片',
-    field: 'image',
-    component: 'Input',
-  },
   {
     label: '车辆价格',
     field: 'price',
     component: 'InputNumber',
   },
   {
-    label: '车辆公里数',
-    field: 'mileage',
+    label: '浏览量',
+    field: 'views',
     component: 'InputNumber',
   },
   {
-    label: '车辆类型',
-    field: 'type',
+    label: '品牌',
+    field: 'brand',
     component: 'Input',
   },
   {
-    label: '车辆标签',
-    field: 'tag',
-    component: 'Input',
+    label: '时间',
+    field: 'carTime',
+    component: 'DatePicker',
   },
   {
-    label: '服务',
-    field: 'services',
-    component: 'Input',
+    label: '公里数',
+    field: 'mileage',
+    component: 'InputNumber',
   },
   {
-    label: '材质',
-    field: 'material',
+    label: '型号',
+    field: 'model',
     component: 'Input',
   },
   {
-    label: '尺寸',
-    field: 'size',
+    label: '车辆库存',
+    field: 'inventory',
+    component: 'InputNumber',
+  },
+  {
+    label: '车辆详情',
+    field: 'detail',
     component: 'Input',
   },
   {
-    label: '商品库存',
-    field: 'inventory',
-    component: 'InputNumber',
+    label: '车辆图片(前)',
+    field: 'imageFront',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
-    label: '已售商品数量',
-    field: 'saleNumber',
-    component: 'InputNumber',
+    label: '车辆照片(后)',
+    field: 'imageBack',
+     component: 'JImageUpload',
+     componentProps:{
+      },
   },
   {
-    label: '商品详情',
-    field: 'detail',
-    component: 'Input',
+    label: '车辆照片(左)',
+    field: 'imageLeft',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '车辆照片(右)',
+    field: 'imageRight',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '车辆照片(驾驶室)',
+    field: 'imageCab',
+     component: 'JImageUpload',
+     componentProps:{
+      },
+  },
+  {
+    label: '关联车辆类型id',
+    field: 'typeId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"carrent_type,name,id"
+     },
+  },
+  {
+    label: '关联车辆分类id',
+    field: 'categoryId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"carrent_category,name,id"
+     },
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/controller/CarrentCompanyController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Api(tags="企业信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/entity/CarrentCompany.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Data
@@ -47,26 +47,22 @@ public class CarrentCompany implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**用户名*/
-	@Excel(name = "用户名", width = 15)
-    @ApiModelProperty(value = "用户名")
-    private java.lang.String userName;
 	/**公司名称*/
 	@Excel(name = "公司名称", width = 15)
     @ApiModelProperty(value = "公司名称")
     private java.lang.String companyName;
-	/**税收编码*/
-	@Excel(name = "税收编码", width = 15)
-    @ApiModelProperty(value = "税收编码")
-    private java.lang.String taxCode;
-	/**公司地址*/
-	@Excel(name = "公司地址", width = 15)
-    @ApiModelProperty(value = "公司地址")
-    private java.lang.String address;
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String userName;
 	/**联系电话*/
 	@Excel(name = "联系电话", width = 15)
     @ApiModelProperty(value = "联系电话")
     private java.lang.String phone;
+	/**公司地址*/
+	@Excel(name = "公司地址", width = 15)
+    @ApiModelProperty(value = "公司地址")
+    private java.lang.String address;
 	/**营业执照*/
 	@Excel(name = "营业执照", width = 15)
     @ApiModelProperty(value = "营业执照")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/mapper/CarrentCompanyMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 public interface CarrentCompanyMapper extends BaseMapper<CarrentCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/ICarrentCompanyService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 public interface ICarrentCompanyService extends IService<CarrentCompany> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/service/impl/CarrentCompanyServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 企业信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/CarrentCompanyList.vue

@@ -122,30 +122,25 @@
               return parseInt(index)+1;
             }
           },
-          {
-            title:'用户名',
-            align:"center",
-            dataIndex: 'userName'
-          },
           {
             title:'公司名称',
             align:"center",
             dataIndex: 'companyName'
           },
           {
-            title:'税收编码',
+            title:'联系人',
             align:"center",
-            dataIndex: 'taxCode'
+            dataIndex: 'userName'
           },
           {
-            title:'公司地址',
+            title:'联系电话',
             align:"center",
-            dataIndex: 'address'
+            dataIndex: 'phone'
           },
           {
-            title:'联系电话',
+            title:'公司地址',
             align:"center",
-            dataIndex: 'phone'
+            dataIndex: 'address'
           },
           {
             title:'营业执照',
@@ -192,11 +187,10 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'userName',text:'用户名',dictCode:''})
         fieldList.push({type:'string',value:'companyName',text:'公司名称',dictCode:''})
-        fieldList.push({type:'string',value:'taxCode',text:'税收编码',dictCode:''})
-        fieldList.push({type:'string',value:'address',text:'公司地址',dictCode:''})
+        fieldList.push({type:'string',value:'userName',text:'联系人',dictCode:''})
         fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
+        fieldList.push({type:'string',value:'address',text:'公司地址',dictCode:''})
         fieldList.push({type:'string',value:'businessLicense',text:'营业执照',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCompany/vue/modules/CarrentCompanyForm.vue

@@ -3,29 +3,24 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
-              <a-input v-model="model.userName" placeholder="请输入用户名"  ></a-input>
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="公司名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyName">
               <a-input v-model="model.companyName" placeholder="请输入公司名称"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="税收编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taxCode">
-              <a-input v-model="model.taxCode" placeholder="请输入税收编码"  ></a-input>
+            <a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入联系人"  ></a-input>
             </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="phone">
+              <a-input v-model="model.phone" 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 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/carrentCompany/vue3/CarrentCompany.data.ts

@@ -5,29 +5,24 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '用户名',
-    align:"center",
-    dataIndex: 'userName'
-   },
-   {
     title: '公司名称',
     align:"center",
     dataIndex: 'companyName'
    },
    {
-    title: '税收编码',
+    title: '联系人',
     align:"center",
-    dataIndex: 'taxCode'
+    dataIndex: 'userName'
    },
    {
-    title: '公司地址',
+    title: '联系电话',
     align:"center",
-    dataIndex: 'address'
+    dataIndex: 'phone'
    },
    {
-    title: '联系电话',
+    title: '公司地址',
     align:"center",
-    dataIndex: 'phone'
+    dataIndex: 'address'
    },
    {
     title: '营业执照',
@@ -46,29 +41,24 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
-    label: '用户名',
-    field: 'userName',
-    component: 'Input',
-  },
   {
     label: '公司名称',
     field: 'companyName',
     component: 'Input',
   },
   {
-    label: '税收编码',
-    field: 'taxCode',
+    label: '联系人',
+    field: 'userName',
     component: 'Input',
   },
   {
-    label: '公司地址',
-    field: 'address',
+    label: '联系电话',
+    field: 'phone',
     component: 'Input',
   },
   {
-    label: '联系电话',
-    field: 'phone',
+    label: '公司地址',
+    field: 'address',
     component: 'Input',
   },
   {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/controller/CarrentOrderController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 预约信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Api(tags="预约信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/entity/CarrentOrder.java

@@ -5,10 +5,12 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.carrentCar.entity.CarrentCar;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 预约信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Data
@@ -47,30 +49,35 @@ public class CarrentOrder implements Serializable {
 	/**更新日期*/
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**联系人名称*/
-	@Excel(name = "联系人名称", width = 15)
-    @ApiModelProperty(value = "联系人名称")
+	/**联系人*/
+	@Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
     private java.lang.String name;
-	/**联系人方式*/
-	@Excel(name = "联系人方式", width = 15)
-    @ApiModelProperty(value = "联系人方式")
+	/**手机号*/
+	@Excel(name = "手机号", width = 15)
+    @ApiModelProperty(value = "手机号")
     private java.lang.String phone;
 	/**所在区域*/
 	@Excel(name = "所在区域", width = 15)
     @ApiModelProperty(value = "所在区域")
     private java.lang.String area;
-	/**详细地址*/
-	@Excel(name = "详细地址", width = 15)
-    @ApiModelProperty(value = "详细地址")
-    private java.lang.String address;
+	/**关联车辆类型*/
+	@Excel(name = "关联车辆类型", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "carrent_type", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联车辆类型")
+    private java.lang.String typeId;
 	/**关联商品*/
 	@Excel(name = "关联商品", width = 15, dictTable = "carrent_car", dicText = "name", dicCode = "id")
 	@Dict(dictTable = "carrent_car", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "关联商品")
     private java.lang.String carId;
 	/**关联用户*/
-	@Excel(name = "关联用户", width = 15, dictTable = "hai_hai_member", dicText = "nick_name", dicCode = "id")
-	@Dict(dictTable = "hai_hai_member", dicText = "nick_name", dicCode = "id")
+	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "关联用户")
     private java.lang.String userId;
+
+    //车辆信息
+    @TableField(exist = false)
+    private CarrentCar carrentCar;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/CarrentOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 预约信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 public interface CarrentOrderMapper extends BaseMapper<CarrentOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/ICarrentOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 预约信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 public interface ICarrentOrderService extends IService<CarrentOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/impl/CarrentOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 预约信息表
  * @Author: jeecg-boot
- * @Date:   2024-11-12
+ * @Date:   2024-12-03
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/CarrentOrderList.vue

@@ -123,12 +123,12 @@
             }
           },
           {
-            title:'联系人名称',
+            title:'联系人',
             align:"center",
             dataIndex: 'name'
           },
           {
-            title:'联系人方式',
+            title:'手机号',
             align:"center",
             dataIndex: 'phone'
           },
@@ -138,9 +138,9 @@
             dataIndex: 'area'
           },
           {
-            title:'详细地址',
+            title:'关联车辆类型',
             align:"center",
-            dataIndex: 'address'
+            dataIndex: 'typeId_dictText'
           },
           {
             title:'关联商品',
@@ -186,12 +186,12 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'name',text:'联系人名称',dictCode:''})
-        fieldList.push({type:'string',value:'phone',text:'联系人方式',dictCode:''})
+        fieldList.push({type:'string',value:'name',text:'联系人',dictCode:''})
+        fieldList.push({type:'string',value:'phone',text:'手机号',dictCode:''})
         fieldList.push({type:'string',value:'area',text:'所在区域',dictCode:''})
-        fieldList.push({type:'string',value:'address',text:'详细地址',dictCode:''})
+        fieldList.push({type:'string',value:'typeId',text:'关联车辆类型',dictCode:"carrent_type,name,id"})
         fieldList.push({type:'string',value:'carId',text:'关联商品',dictCode:"carrent_car,name,id"})
-        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"hai_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderForm.vue

@@ -4,13 +4,13 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
           <a-col :span="24">
-            <a-form-model-item label="联系人名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
-              <a-input v-model="model.name" placeholder="请输入联系人名称"  ></a-input>
+            <a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" 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 label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
+              <a-input v-model="model.phone" placeholder="请输入手机号"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -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="typeId">
+              <j-dict-select-tag type="list" v-model="model.typeId" dictCode="carrent_type,name,id" placeholder="请选择关联车辆类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -30,7 +30,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="关联用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
-              <j-dict-select-tag type="list" v-model="model.userId" dictCode="hai_hai_member,nick_name,id" placeholder="请选择关联用户" />
+              <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择关联用户" />
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue3/CarrentOrder.data.ts

@@ -5,12 +5,12 @@ import { render } from '/@/utils/common/renderUtils';
 //列表数据
 export const columns: BasicColumn[] = [
     {
-    title: '联系人名称',
+    title: '联系人',
     align:"center",
     dataIndex: 'name'
    },
    {
-    title: '联系人方式',
+    title: '手机号',
     align:"center",
     dataIndex: 'phone'
    },
@@ -20,9 +20,9 @@ export const columns: BasicColumn[] = [
     dataIndex: 'area'
    },
    {
-    title: '详细地址',
+    title: '关联车辆类型',
     align:"center",
-    dataIndex: 'address'
+    dataIndex: 'typeId_dictText'
    },
    {
     title: '关联商品',
@@ -41,12 +41,12 @@ export const searchFormSchema: FormSchema[] = [
 //表单数据
 export const formSchema: FormSchema[] = [
   {
-    label: '联系人名称',
+    label: '联系人',
     field: 'name',
     component: 'Input',
   },
   {
-    label: '联系人方式',
+    label: '手机号',
     field: 'phone',
     component: 'Input',
   },
@@ -56,9 +56,12 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '详细地址',
-    field: 'address',
-    component: 'Input',
+    label: '关联车辆类型',
+    field: 'typeId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"carrent_type,name,id"
+     },
   },
   {
     label: '关联商品',
@@ -73,7 +76,7 @@ export const formSchema: FormSchema[] = [
     field: 'userId',
     component: 'JDictSelectTag',
     componentProps:{
-        dictCode:"hai_hai_member,nick_name,id"
+        dictCode:"han_hai_member,nick_name,id"
      },
   },
 ];

jeecg-boot-module-system/pom.xml

@@ -77,6 +77,7 @@
     </dependencies>
 
 	<build>
+		<finalName>carrent-admin</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CarController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
-@Api(tags="商品信息相关接口")
+@Api(tags="车辆信息相关接口")
 @RestController
 @RequestMapping("/api/car")
 @Slf4j
@@ -24,13 +24,13 @@ public class CarController {
     private CarService carService;
     /****************************************************************************************************/
 
-    @ApiOperation(value="首页-获取商品列表", notes="首页-获取商品列表")
+    @ApiOperation(value="首页-获取车辆列表", notes="首页-获取车辆列表")
     @RequestMapping(value = "/queryCarList", method = {RequestMethod.GET})
     public Result<?> queryCarList(CarBean carBean, PageBean pageBean){
         return carService.queryCarList(carBean, pageBean);
     }
 
-    @ApiOperation(value="首页-根据id获取商品详情", notes="首页-根据id获取商品详情")
+    @ApiOperation(value="首页-根据id获取车辆详情", notes="首页-根据id获取车辆详情")
     @RequestMapping(value = "/queryCarById", method = {RequestMethod.GET})
     public Result<?> queryCarById(String carId){
         return carService.queryCarById(carId);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/CompanyController.java

@@ -33,23 +33,20 @@ public class CompanyController {
         CarrentCompany carrentCompany = new CarrentCompany();
         carrentCompany.setUserName(companyBean.getUserName());
         carrentCompany.setCompanyName(companyBean.getCompanyName());
-        carrentCompany.setTaxCode(companyBean.getTaxCode());
         carrentCompany.setAddress(companyBean.getAddress());
         carrentCompany.setPhone(companyBean.getPhone());
         carrentCompany.setBusinessLicense(companyBean.getBusinessLicense());
 
         String message = "";
         //注册信息验证
-        if(StringUtils.isEmpty(carrentCompany.getUserName())){
-            message = "用户名未填写，请填写用户名!";
-        }else if(StringUtils.isEmpty(carrentCompany.getCompanyName())){
+        if(StringUtils.isEmpty(carrentCompany.getCompanyName())){
             message = "公司名称未填写，请填写公司名称!";
-        }else if(StringUtils.isEmpty(carrentCompany.getTaxCode())){
-            message = "税收编码未填写，请填写税收编码!";
-        }else if(StringUtils.isEmpty(carrentCompany.getAddress())){
-            message = "公司地址未填写，请填写公司地址!";
+        }else if(StringUtils.isEmpty(carrentCompany.getUserName())){
+            message = "联系人未填写，请填写联系人!";
         }else if(StringUtils.isEmpty(carrentCompany.getPhone())){
             message = "联系电话未填写，请填写联系电话!";
+        }else if(StringUtils.isEmpty(carrentCompany.getAddress())){
+            message = "公司地址未填写，请填写公司地址!";
         }else if(StringUtils.isEmpty(carrentCompany.getBusinessLicense())){
             message = "营业执照未填写，请上传营业执照!";
         }else {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/OrderController.java

@@ -10,6 +10,7 @@ import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.NewsService;
 import org.jeecg.modules.apiService.OrderService;
 import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,9 +28,15 @@ public class OrderController {
     private OrderService orderService;
     /****************************************************************************************************/
 
-    @ApiOperation(value="商品预约-提交预约信息", notes="商品预约-提交预约信息")
+    @ApiOperation(value="车辆预约-车辆预约列表", notes="车辆预约-车辆预约列表")
+    @RequestMapping(value = "/queryOrderList", method = {RequestMethod.GET})
+    public Result<?> queryOrderList(@RequestHeader("X-Access-Token") String token, String typeId, PageBean pageBean){
+        return orderService.queryOrderList(token, typeId, pageBean);
+    }
+
+    @ApiOperation(value="车辆预约-提交预约信息", notes="车辆预约-提交预约信息")
     @RequestMapping(value = "/addOrder", method = {RequestMethod.POST})
-    public Result<?> addOrder(OrderBean orderBean){
+    public Result<?> addOrder(@RequestHeader("X-Access-Token") String token, OrderBean orderBean){
 
         //将预约信息注入到实体bean中
         CarrentOrder carrentOrder = new CarrentOrder();
@@ -47,7 +54,7 @@ public class OrderController {
             message = "预约商品id未填写，请填写预约商品id";
         }else {
             //预约信息无误，进入业务流程处理
-            return orderService.addOrder(carrentOrder);
+            return orderService.addOrder(token, carrentOrder);
         }
 
         //预约信息有误，返回错误信息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/carrentController/UserController.java

@@ -25,6 +25,23 @@ public class UserController {
     private UserService userService;
     /****************************************************************************************************/
 
+    @ApiOperation(value="用户信息-查询个人信息", notes="用户信息-查询个人信息")
+    @RequestMapping(value = "/queryUser", method = {RequestMethod.POST})
+    public Result<?> queryUser(String id){
+
+        String message = "查询个人信息失败";
+        //注册信息验证
+        if(StringUtils.isEmpty(id)){
+            message = "用户id未填写，请填写用户id!";
+        }else {
+            //注册信息无误，进入业务流程处理
+            return userService.queryUser(id);
+        }
+
+        //注册信息有误，返回错误信息
+        return Result.error(message);
+    }
+
     @ApiOperation(value="用户信息-个人注册", notes="用户信息-个人注册")
     @RequestMapping(value = "/addUser", method = {RequestMethod.POST})
     public Result<?> addUser(UserBean userBean){
@@ -60,6 +77,7 @@ public class UserController {
     public Result<?> updateUser(UserBean userBean){
         //将注册信息注入到实体bean中
         CarrentUser carrentUser = new CarrentUser();
+        carrentUser.setId(userBean.getId());
         carrentUser.setName(userBean.getName());
         carrentUser.setCerNo(userBean.getCerNo());
         carrentUser.setPhone(userBean.getPhone());
@@ -75,6 +93,8 @@ public class UserController {
             message = "联系方式未填写，请填写联系方式!";
         }else if(StringUtils.isEmpty(carrentUser.getCerImage())){
             message = "身份证正面照片未填写，请上传身份证正面照片!";
+        }else if(StringUtils.isEmpty(carrentUser.getId())){
+            message = "用户编号未填写，请填写用户编号!";
         }else {
             //注册信息无误，进入业务流程处理
             return userService.updateUser(carrentUser);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CarBean.java

@@ -1,19 +1,38 @@
 package org.jeecg.modules.apiBean;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 @Data
 public class CarBean {
 
-    /**车辆公里数*/
-    @Excel(name = "车辆公里数", width = 15)
-    @ApiModelProperty(value = "车辆公里数")
+    /**品牌*/
+    @Excel(name = "品牌", width = 15)
+    @ApiModelProperty(value = "品牌")
+    private java.lang.String brand;
+    /**时间*/
+    @Excel(name = "时间", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "时间")
+    private java.util.Date carTime;
+    /**公里数*/
+    @Excel(name = "公里数", width = 15)
+    @ApiModelProperty(value = "公里数")
     private java.lang.Integer mileage;
-    /**车辆类型*/
-    @Excel(name = "车辆类型", width = 15)
-    @ApiModelProperty(value = "车辆类型")
-    private java.lang.String type;
+    /**关联车辆类型id*/
+    @Excel(name = "关联车辆类型id", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "carrent_type", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联车辆类型id")
+    private java.lang.String typeId;
+    /**关联车辆分类id*/
+    @Excel(name = "关联车辆分类id", width = 15, dictTable = "carrent_category", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "carrent_category", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联车辆分类id")
+    private java.lang.String categoryId;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/CompanyBean.java

@@ -6,26 +6,22 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 
 @Data
 public class CompanyBean {
-    /**用户名*/
-    @Excel(name = "用户名", width = 15)
-    @ApiModelProperty(value = "用户名")
-    private java.lang.String userName;
     /**公司名称*/
     @Excel(name = "公司名称", width = 15)
     @ApiModelProperty(value = "公司名称")
     private java.lang.String companyName;
-    /**税收编码*/
-    @Excel(name = "税收编码", width = 15)
-    @ApiModelProperty(value = "税收编码")
-    private java.lang.String taxCode;
-    /**公司地址*/
-    @Excel(name = "公司地址", width = 15)
-    @ApiModelProperty(value = "公司地址")
-    private java.lang.String address;
+    /**联系人*/
+    @Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
+    private java.lang.String userName;
     /**联系电话*/
     @Excel(name = "联系电话", width = 15)
     @ApiModelProperty(value = "联系电话")
     private java.lang.String phone;
+    /**公司地址*/
+    @Excel(name = "公司地址", width = 15)
+    @ApiModelProperty(value = "公司地址")
+    private java.lang.String address;
     /**营业执照*/
     @Excel(name = "营业执照", width = 15)
     @ApiModelProperty(value = "营业执照")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/OrderBean.java

@@ -8,26 +8,31 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @Data
 public class OrderBean {
 
-    /**姓名*/
-    @Excel(name = "姓名", width = 15)
-    @ApiModelProperty(value = "姓名")
+    /**联系人*/
+    @Excel(name = "联系人", width = 15)
+    @ApiModelProperty(value = "联系人")
     private java.lang.String name;
-    /**联系方式*/
-    @Excel(name = "联系方式", width = 15)
-    @ApiModelProperty(value = "联系方式")
+    /**手机号*/
+    @Excel(name = "手机号", width = 15)
+    @ApiModelProperty(value = "手机号")
     private java.lang.String phone;
-    /**所属区域*/
-    @Excel(name = "所属区域", width = 15)
-    @ApiModelProperty(value = "所属区域")
+    /**所在区域*/
+    @Excel(name = "所在区域", width = 15)
+    @ApiModelProperty(value = "所在区域")
     private java.lang.String area;
-    /**详细地址*/
-    @Excel(name = "详细地址", width = 15)
-    @ApiModelProperty(value = "详细地址")
-    private java.lang.String address;
+    /**关联车辆类型*/
+    @Excel(name = "关联车辆类型", width = 15, dictTable = "carrent_type", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "carrent_type", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联车辆类型")
+    private java.lang.String typeId;
     /**关联商品*/
     @Excel(name = "关联商品", width = 15, dictTable = "carrent_car", dicText = "name", dicCode = "id")
     @Dict(dictTable = "carrent_car", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "关联商品")
     private java.lang.String carId;
-
+    /**关联用户*/
+    @Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "关联用户")
+    private java.lang.String userId;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/UserBean.java

@@ -1,11 +1,17 @@
 package org.jeecg.modules.apiBean;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 @Data
 public class UserBean {
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
     /**姓名*/
     @Excel(name = "姓名", width = 15)
     @ApiModelProperty(value = "姓名")

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

@@ -2,16 +2,28 @@ package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.OrderBean;
+import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 public interface OrderService {
 
+    /**
+     * 商品预约-查看预约列表
+     * @param token
+     * @param typeId
+     * @param pageBean
+     * @return
+     */
+    public Result<?> queryOrderList(@RequestHeader("X-Access-Token") String token, String typeId, PageBean pageBean);
+
     /**
      * 商品预约-提交预约信息
-     * @param carrentOrder 预约信息
+     * @param token
+     * @param carrentOrder
      * @return
      */
-    public Result<?> addOrder(CarrentOrder carrentOrder);
+    public Result<?> addOrder(String token, CarrentOrder carrentOrder);
 
     /**
      * 商品预约-联系电话

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

@@ -6,6 +6,13 @@ import org.jeecg.modules.carrentUser.entity.CarrentUser;
 
 public interface UserService {
 
+    /**
+     * 用户信息-查询个人信息
+     * @param id 用户编号
+     * @return
+     */
+    public Result<?> queryUser(String id);
+
     /**
      * 用户信息-个人注册
      * @param carrentUser 用户信息

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

@@ -38,11 +38,21 @@ public class CarServiceImpl implements CarService {
             LambdaQueryChainWrapper<CarrentCar> query = carrentCarService.lambdaQuery();
 
             //组装查询条件
-            if(null != carBean.getType()){
-                query.eq(CarrentCar::getType, carBean.getType());
+            if(null != carBean.getTypeId()){
+                //车辆类型
+                query.eq(CarrentCar::getTypeId, carBean.getTypeId());
+            }
+            if(null != carBean.getCategoryId()){
+                //分类
+                query.eq(CarrentCar::getCategoryId, carBean.getCategoryId());
+            }
+            if(null != carBean.getCarTime()){
+                //时间
+                query.le(CarrentCar::getCarTime, carBean.getCarTime());
             }
             if(null != carBean.getMileage()){
-                query.eq(CarrentCar::getMileage, carBean.getMileage());
+                //公里数
+                query.between(CarrentCar::getMileage, 0, carBean.getMileage());
             }
 
             //获取商品列表

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

@@ -1,26 +1,78 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.OrderBean;
+import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.OrderService;
+import org.jeecg.modules.carrentCar.entity.CarrentCar;
+import org.jeecg.modules.carrentCar.service.ICarrentCarService;
 import org.jeecg.modules.carrentOrder.entity.CarrentOrder;
 import org.jeecg.modules.carrentOrder.service.ICarrentOrderService;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class OrderServiceImpl implements OrderService {
 
     /*************************************************************************************/
+    //权限验证
+    @Resource
+    private ShiroRealm shiroRealm;
+
     //预约信息
     @Resource
     private ICarrentOrderService carrentOrderService;
+
+    //车辆信息
+    @Resource
+    private ICarrentCarService carrentCarService;
+
     /*************************************************************************************/
+    //商品预约-查询预约列表
+    @Override
+    public Result<?> queryOrderList(String token, String typeId, PageBean pageBean) {
+        //权限验证
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        //分页
+        Page<CarrentOrder> page = new Page<CarrentOrder>(pageBean.getPageNo(), pageBean.getPageSize());
+        LambdaQueryChainWrapper<CarrentOrder> query = carrentOrderService
+                .lambdaQuery();
+
+        //组装查询条件
+        //query.eq(CarrentOrder::getUserId, hanHaiMember.getId());
+        if(null != typeId){
+            //车辆类型
+            query.eq(CarrentOrder::getTypeId, typeId);
+        }
+
+        //获取收藏表信息
+        Page<CarrentOrder> pageList = query.page(page);
+
+        //将车辆信息放入列表中
+        CarrentCar carrentCar;
+        for (CarrentOrder record : pageList.getRecords()) {
+            carrentCar = carrentCarService.getById(record.getCarId());
+            record.setCarrentCar(carrentCar);
+        }
+
+        return Result.OK("预约列表", pageList);
+    }
 
     //商品预约-提交预约信息
     @Override
-    public Result<?> addOrder(CarrentOrder carrentOrder) {
+    public Result<?> addOrder(String token, CarrentOrder carrentOrder) {
+
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        carrentOrder.setUserId(hanHaiMember.getId());
+
         //返回信息
         String message = "预约信息提交失败";
         //执行结果

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

@@ -17,6 +17,34 @@ public class UserServiceImpl implements UserService {
     private ICarrentUserService carrentUserService;
     /*************************************************************************************/
 
+    //用户信息-查询个人新增
+    @Override
+    public Result<?> queryUser(String id) {
+        //返回信息
+        String message = "查询失败";
+
+        try{
+            //执行个人注册
+            CarrentUser user = carrentUserService.getById(id);
+
+            //判断执行结果
+            if(null != user){
+                message = "个人信息！";
+            }else {
+                message = "没有查询到用户信息！";
+            }
+
+            //返回执行结果
+            return Result.OK(message, user);
+
+        }catch (Exception e){
+            //错误信息打印
+            e.printStackTrace();
+            return Result.OK(message);
+        }
+
+    }
+
     //用户信息-个人注册
     @Override
     public Result<?> addUser(CarrentUser carrentUser) {

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8000
+  port: 8003
   tomcat:
     max-swallow-size: -1
   error:
@@ -7,7 +7,7 @@ server:
     include-stacktrace: ALWAYS
     include-message: ALWAYS
   servlet:
-    context-path: /carrent-admin-api
+    context-path: /carrent-admin
   compression:
     enabled: true
     min-response-size: 1024

jeecg-boot-module-system/src/main/resources/static/generic/web/locale/zh-CN/viewer.properties

@@ -32,7 +32,7 @@ zoom_in_label=放大
 zoom.title=缩放
 presentation_mode.title=切换到演示模式
 presentation_mode_label=演示模式
-open_file.title=carrent-admin-api文件
+open_file.title=carrent-admin文件
 open_file_label=打开
 print.title=打印
 print_label=打印