diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c94fe0a..0aa1bbe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,34 +1,131 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -37,22 +134,23 @@
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
+
+
-
-
@@ -115,6 +213,7 @@
+
@@ -129,10 +228,14 @@
-
+
+
+
+
+
-
+
@@ -151,9 +254,20 @@
+
+
+
+
+
+
+
+
+
+
@@ -169,7 +283,9 @@
1731381532980
-
+
+
+
1731385713383
@@ -206,7 +322,28 @@
1733219056792
-
+
+ 1733221539299
+
+
+
+ 1733221539299
+
+
+ 1733221591234
+
+
+
+ 1733221591234
+
+
+ 1733880722458
+
+
+
+ 1733880722458
+
+
@@ -232,96 +369,118 @@
-
+
+
+
+
-
+
-
+
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ConfigServiceImpl.java
+ 206
+
+
+
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java
similarity index 56%
rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.java
rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java
index f447d93..1148d8e 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentCategory/controller/CarrentCategoryController.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/controller/CarrentApplyController.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.carrentCategory.controller;
+package org.jeecg.modules.carrentApply.controller;
import java.util.Arrays;
import java.util.List;
@@ -12,8 +12,8 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.carrentCategory.entity.CarrentCategory;
-import org.jeecg.modules.carrentCategory.service.ICarrentCategoryService;
+import org.jeecg.modules.carrentApply.entity.CarrentApply;
+import org.jeecg.modules.carrentApply.service.ICarrentApplyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,66 +37,66 @@ import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
- * @Description: 分类表
+ * @Description: 寻车申请表
* @Author: jeecg-boot
- * @Date: 2024-11-12
+ * @Date: 2024-12-12
* @Version: V1.0
*/
-@Api(tags="分类表")
+@Api(tags="寻车申请表")
@RestController
-@RequestMapping("/carrentCategory/carrentCategory")
+@RequestMapping("/carrentApply/carrentApply")
@Slf4j
-public class CarrentCategoryController extends JeecgController {
+public class CarrentApplyController extends JeecgController {
@Autowired
- private ICarrentCategoryService carrentCategoryService;
+ private ICarrentApplyService carrentApplyService;
/**
* 分页列表查询
*
- * @param carrentCategory
+ * @param carrentApply
* @param pageNo
* @param pageSize
* @param req
* @return
*/
- //@AutoLog(value = "分类表-分页列表查询")
- @ApiOperation(value="分类表-分页列表查询", notes="分类表-分页列表查询")
+ //@AutoLog(value = "寻车申请表-分页列表查询")
+ @ApiOperation(value="寻车申请表-分页列表查询", notes="寻车申请表-分页列表查询")
@GetMapping(value = "/list")
- public Result> queryPageList(CarrentCategory carrentCategory,
+ public Result> queryPageList(CarrentApply carrentApply,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentCategory, req.getParameterMap());
- Page page = new Page(pageNo, pageSize);
- IPage pageList = carrentCategoryService.page(page, queryWrapper);
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentApply, req.getParameterMap());
+ Page page = new Page(pageNo, pageSize);
+ IPage pageList = carrentApplyService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
- * @param carrentCategory
+ * @param carrentApply
* @return
*/
- @AutoLog(value = "分类表-添加")
- @ApiOperation(value="分类表-添加", notes="分类表-添加")
+ @AutoLog(value = "寻车申请表-添加")
+ @ApiOperation(value="寻车申请表-添加", notes="寻车申请表-添加")
@PostMapping(value = "/add")
- public Result add(@RequestBody CarrentCategory carrentCategory) {
- carrentCategoryService.save(carrentCategory);
+ public Result add(@RequestBody CarrentApply carrentApply) {
+ carrentApplyService.save(carrentApply);
return Result.OK("添加成功！");
}
/**
* 编辑
*
- * @param carrentCategory
+ * @param carrentApply
* @return
*/
- @AutoLog(value = "分类表-编辑")
- @ApiOperation(value="分类表-编辑", notes="分类表-编辑")
+ @AutoLog(value = "寻车申请表-编辑")
+ @ApiOperation(value="寻车申请表-编辑", notes="寻车申请表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result edit(@RequestBody CarrentCategory carrentCategory) {
- carrentCategoryService.updateById(carrentCategory);
+ public Result edit(@RequestBody CarrentApply carrentApply) {
+ carrentApplyService.updateById(carrentApply);
return Result.OK("编辑成功!");
}
@@ -106,11 +106,11 @@ public class CarrentCategoryController extends JeecgController delete(@RequestParam(name="id",required=true) String id) {
- carrentCategoryService.removeById(id);
+ carrentApplyService.removeById(id);
return Result.OK("删除成功!");
}
@@ -120,11 +120,11 @@ public class CarrentCategoryController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.carrentCategoryService.removeByIds(Arrays.asList(ids.split(",")));
+ this.carrentApplyService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@@ -134,26 +134,26 @@ public class CarrentCategoryController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) {
- CarrentCategory carrentCategory = carrentCategoryService.getById(id);
- if(carrentCategory==null) {
+ public Result queryById(@RequestParam(name="id",required=true) String id) {
+ CarrentApply carrentApply = carrentApplyService.getById(id);
+ if(carrentApply==null) {
return Result.error("未找到对应数据");
}
- return Result.OK(carrentCategory);
+ return Result.OK(carrentApply);
}
/**
* 导出excel
*
* @param request
- * @param carrentCategory
+ * @param carrentApply
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, CarrentCategory carrentCategory) {
- return super.exportXls(request, carrentCategory, CarrentCategory.class, "分类表");
+ public ModelAndView exportXls(HttpServletRequest request, CarrentApply carrentApply) {
+ return super.exportXls(request, carrentApply, CarrentApply.class, "寻车申请表");
}
/**
@@ -165,7 +165,7 @@ public class CarrentCategoryController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, CarrentCategory.class);
+ return super.importExcel(request, response, CarrentApply.class);
}
}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java
new file mode 100644
index 0000000..f490adc
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/entity/CarrentApply.java
@@ -0,0 +1,86 @@
+package org.jeecg.modules.carrentApply.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 寻车申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("carrent_apply")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="carrent_apply对象", description="寻车申请表")
+public class CarrentApply implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**主键*/
+ @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;
+ /**关联二级分类id*/
+ @Excel(name = "关联二级分类id", width = 15, dictTable = "carrent_categorytwo", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "carrent_categorytwo", dicText = "name", dicCode = "id")
+ @ApiModelProperty(value = "关联二级分类id")
+ private java.lang.String categorytwoId;
+ /**车辆型号*/
+ @Excel(name = "车辆型号", width = 15)
+ @ApiModelProperty(value = "车辆型号")
+ private java.lang.String model;
+ /**年限*/
+ @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 name;
+ /**联系电话*/
+ @Excel(name = "联系电话", width = 15)
+ @ApiModelProperty(value = "联系电话")
+ private java.lang.String phone;
+ /**备注*/
+ @Excel(name = "备注", width = 15)
+ @ApiModelProperty(value = "备注")
+ private java.lang.String remark;
+ /**关联用户*/
+ @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;
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java
new file mode 100644
index 0000000..67f7291
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/CarrentApplyMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.carrentApply.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.carrentApply.entity.CarrentApply;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 寻车申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-12
+ * @Version: V1.0
+ */
+public interface CarrentApplyMapper extends BaseMapper {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/xml/CarrentApplyMapper.xml
similarity index 62%
rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml
rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/xml/CarrentApplyMapper.xml
index bc1e961..d0352d7 100644
--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentArea/mapper/xml/CarrentAreaMapper.xml
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/mapper/xml/CarrentApplyMapper.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java
new file mode 100644
index 0000000..b869b5b
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/ICarrentApplyService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.carrentApply.service;
+
+import org.jeecg.modules.carrentApply.entity.CarrentApply;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 寻车申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-12
+ * @Version: V1.0
+ */
+public interface ICarrentApplyService extends IService {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java
new file mode 100644
index 0000000..af00bb6
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/service/impl/CarrentApplyServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.carrentApply.service.impl;
+
+import org.jeecg.modules.carrentApply.entity.CarrentApply;
+import org.jeecg.modules.carrentApply.mapper.CarrentApplyMapper;
+import org.jeecg.modules.carrentApply.service.ICarrentApplyService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 寻车申请表
+ * @Author: jeecg-boot
+ * @Date: 2024-12-12
+ * @Version: V1.0
+ */
+@Service
+public class CarrentApplyServiceImpl extends ServiceImpl implements ICarrentApplyService {
+
+}
diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue
new file mode 100644
index 0000000..aab1188
--- /dev/null
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentApply/vue/CarrentApplyList.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+
+
新增
+
导出
+
+ 导入
+
+
+
+
+
+ 删除
+
+ 批量操作
+
+
+
+
+
+
+
+
+
+
+ 无图片
+ ![]()
+
+
+ 无文件
+
+ 下载
+
+
+
+
+ 编辑
+
+
+
+ 更多
+
+
+ 详情
+
+
+
+ 删除
+
+
+
+
+
+
+
+