diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/controller/CarrrentOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/controller/CarrentOrderController.java similarity index 72% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/controller/CarrrentOrderController.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/controller/CarrentOrderController.java index 9f4baba..e88d929 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/controller/CarrrentOrderController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/controller/CarrentOrderController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.carrrentOrder.controller; +package org.jeecg.modules.carrentOrder.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.carrrentOrder.entity.CarrrentOrder; -import org.jeecg.modules.carrrentOrder.service.ICarrrentOrderService; +import org.jeecg.modules.carrentOrder.entity.CarrentOrder; +import org.jeecg.modules.carrentOrder.service.ICarrentOrderService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -44,16 +44,16 @@ import org.jeecg.common.aspect.annotation.AutoLog; */ @Api(tags="预约信息表") @RestController -@RequestMapping("/carrrentOrder/carrrentOrder") +@RequestMapping("/carrentOrder/carrentOrder") @Slf4j -public class CarrrentOrderController extends JeecgController { +public class CarrentOrderController extends JeecgController { @Autowired - private ICarrrentOrderService carrrentOrderService; + private ICarrentOrderService carrentOrderService; /** * 分页列表查询 * - * @param carrrentOrder + * @param carrentOrder * @param pageNo * @param pageSize * @param req @@ -62,41 +62,41 @@ public class CarrrentOrderController extends JeecgController> queryPageList(CarrrentOrder carrrentOrder, + public Result> queryPageList(CarrentOrder carrentOrder, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrrentOrder, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = carrrentOrderService.page(page, queryWrapper); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(carrentOrder, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = carrentOrderService.page(page, queryWrapper); return Result.OK(pageList); } /** * 添加 * - * @param carrrentOrder + * @param carrentOrder * @return */ @AutoLog(value = "预约信息表-添加") @ApiOperation(value="预约信息表-添加", notes="预约信息表-添加") @PostMapping(value = "/add") - public Result add(@RequestBody CarrrentOrder carrrentOrder) { - carrrentOrderService.save(carrrentOrder); + public Result add(@RequestBody CarrentOrder carrentOrder) { + carrentOrderService.save(carrentOrder); return Result.OK("添加成功!"); } /** * 编辑 * - * @param carrrentOrder + * @param carrentOrder * @return */ @AutoLog(value = "预约信息表-编辑") @ApiOperation(value="预约信息表-编辑", notes="预约信息表-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody CarrrentOrder carrrentOrder) { - carrrentOrderService.updateById(carrrentOrder); + public Result edit(@RequestBody CarrentOrder carrentOrder) { + carrentOrderService.updateById(carrentOrder); return Result.OK("编辑成功!"); } @@ -110,7 +110,7 @@ public class CarrrentOrderController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { - carrrentOrderService.removeById(id); + carrentOrderService.removeById(id); return Result.OK("删除成功!"); } @@ -124,7 +124,7 @@ public class CarrrentOrderController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.carrrentOrderService.removeByIds(Arrays.asList(ids.split(","))); + this.carrentOrderService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @@ -137,23 +137,23 @@ public class CarrrentOrderController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { - CarrrentOrder carrrentOrder = carrrentOrderService.getById(id); - if(carrrentOrder==null) { + public Result queryById(@RequestParam(name="id",required=true) String id) { + CarrentOrder carrentOrder = carrentOrderService.getById(id); + if(carrentOrder==null) { return Result.error("未找到对应数据"); } - return Result.OK(carrrentOrder); + return Result.OK(carrentOrder); } /** * 导出excel * * @param request - * @param carrrentOrder + * @param carrentOrder */ @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, CarrrentOrder carrrentOrder) { - return super.exportXls(request, carrrentOrder, CarrrentOrder.class, "预约信息表"); + public ModelAndView exportXls(HttpServletRequest request, CarrentOrder carrentOrder) { + return super.exportXls(request, carrentOrder, CarrentOrder.class, "预约信息表"); } /** @@ -165,7 +165,7 @@ public class CarrrentOrderController extends JeecgController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, CarrrentOrder.class); + return super.importExcel(request, response, CarrentOrder.class); } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/entity/CarrrentOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/entity/CarrentOrder.java similarity index 76% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/entity/CarrrentOrder.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/entity/CarrentOrder.java index 09108e7..4fc53c0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/entity/CarrrentOrder.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/entity/CarrentOrder.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.carrrentOrder.entity; +package org.jeecg.modules.carrentOrder.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -24,11 +24,11 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("carrrent_order") +@TableName("carrent_order") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="carrrent_order对象", description="预约信息表") -public class CarrrentOrder implements Serializable { +@ApiModel(value="carrent_order对象", description="预约信息表") +public class CarrentOrder implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ @@ -47,17 +47,17 @@ public class CarrrentOrder 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 = "所属区域") + /**所在区域*/ + @Excel(name = "所在区域", width = 15) + @ApiModelProperty(value = "所在区域") private java.lang.String area; /**详细地址*/ @Excel(name = "详细地址", width = 15) @@ -69,8 +69,8 @@ public class CarrrentOrder implements Serializable { @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") + @Excel(name = "关联用户", width = 15, dictTable = "hai_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "hai_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/carrrentOrder/mapper/CarrrentOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/CarrentOrderMapper.java similarity index 56% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/CarrrentOrderMapper.java rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/CarrentOrderMapper.java index 43ba250..64aa097 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/CarrrentOrderMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/CarrentOrderMapper.java @@ -1,9 +1,9 @@ -package org.jeecg.modules.carrrentOrder.mapper; +package org.jeecg.modules.carrentOrder.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.carrrentOrder.entity.CarrrentOrder; +import org.jeecg.modules.carrentOrder.entity.CarrentOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -12,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2024-11-12 * @Version: V1.0 */ -public interface CarrrentOrderMapper extends BaseMapper { +public interface CarrentOrderMapper extends BaseMapper { } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/xml/CarrrentOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/xml/CarrentOrderMapper.xml similarity index 62% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/xml/CarrrentOrderMapper.xml rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/xml/CarrentOrderMapper.xml index 8375bab..8a0f4a3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/mapper/xml/CarrrentOrderMapper.xml +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/mapper/xml/CarrentOrderMapper.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/carrentOrder/service/ICarrentOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/ICarrentOrderService.java new file mode 100644 index 0000000..7653b32 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/ICarrentOrderService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.carrentOrder.service; + +import org.jeecg.modules.carrentOrder.entity.CarrentOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 预约信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +public interface ICarrentOrderService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/impl/CarrentOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/impl/CarrentOrderServiceImpl.java new file mode 100644 index 0000000..5998679 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/service/impl/CarrentOrderServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.carrentOrder.service.impl; + +import org.jeecg.modules.carrentOrder.entity.CarrentOrder; +import org.jeecg.modules.carrentOrder.mapper.CarrentOrderMapper; +import org.jeecg.modules.carrentOrder.service.ICarrentOrderService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 预约信息表 + * @Author: jeecg-boot + * @Date: 2024-11-12 + * @Version: V1.0 + */ +@Service +public class CarrentOrderServiceImpl extends ServiceImpl implements ICarrentOrderService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/CarrrentOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/CarrentOrderList.vue similarity index 87% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/CarrrentOrderList.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/CarrentOrderList.vue index d2c18a6..23c4c30 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/CarrrentOrderList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/CarrentOrderList.vue @@ -89,7 +89,7 @@ - + @@ -98,14 +98,14 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import CarrrentOrderModal from './modules/CarrrentOrderModal' + import CarrentOrderModal from './modules/CarrentOrderModal' import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { - name: 'CarrrentOrderList', + name: 'CarrentOrderList', mixins:[JeecgListMixin, mixinDevice], components: { - CarrrentOrderModal + CarrentOrderModal }, data () { return { @@ -123,17 +123,17 @@ } }, { - title:'姓名', + title:'联系人名称', align:"center", dataIndex: 'name' }, { - title:'联系方式', + title:'联系人方式', align:"center", dataIndex: 'phone' }, { - title:'所属区域', + title:'所在区域', align:"center", dataIndex: 'area' }, @@ -162,11 +162,11 @@ } ], url: { - list: "/carrrentOrder/carrrentOrder/list", - delete: "/carrrentOrder/carrrentOrder/delete", - deleteBatch: "/carrrentOrder/carrrentOrder/deleteBatch", - exportXlsUrl: "/carrrentOrder/carrrentOrder/exportXls", - importExcelUrl: "carrrentOrder/carrrentOrder/importExcel", + list: "/carrentOrder/carrentOrder/list", + delete: "/carrentOrder/carrentOrder/delete", + deleteBatch: "/carrentOrder/carrentOrder/deleteBatch", + exportXlsUrl: "/carrentOrder/carrentOrder/exportXls", + importExcelUrl: "carrentOrder/carrentOrder/importExcel", }, dictOptions:{}, @@ -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:'area',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:'carId',text:'关联商品',dictCode:"carrent_car,name,id"}) - fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"}) + fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"hai_hai_member,nick_name,id"}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderForm.vue similarity index 84% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderForm.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderForm.vue index ebdde3f..c6ea066 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderForm.vue @@ -4,18 +4,18 @@ - - + + - - + + - - + + @@ -30,7 +30,7 @@ - + @@ -45,7 +45,7 @@ import { validateDuplicateValue } from '@/utils/util' export default { - name: 'CarrrentOrderForm', + name: 'CarrentOrderForm', components: { }, props: { @@ -72,9 +72,9 @@ validatorRules: { }, url: { - add: "/carrrentOrder/carrrentOrder/add", - edit: "/carrrentOrder/carrrentOrder/edit", - queryById: "/carrrentOrder/carrrentOrder/queryById" + add: "/carrentOrder/carrentOrder/add", + edit: "/carrentOrder/carrentOrder/edit", + queryById: "/carrentOrder/carrentOrder/queryById" } } }, diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderModal.Style#Drawer.vue similarity index 87% rename from jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.Style#Drawer.vue rename to jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderModal.Style#Drawer.vue index a51aaa7..384c61e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrrentOrder/vue/modules/CarrrentOrderModal.Style#Drawer.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/carrentOrder/vue/modules/CarrentOrderModal.Style#Drawer.vue @@ -7,7 +7,7 @@ @close="close" destroyOnClose :visible="visible"> - +