租车订单详情展示车辆变更记录

ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderCarChangeController.java

@@ -0,0 +1,127 @@
+package com.ruoyi.orders.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.orders.domain.ZcOrderCarChange;
+import com.ruoyi.orders.service.IZcOrderCarChangeService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 订单车辆变更Controller
+ * 
+ * @author ruoyi
+ * @date 2025-09-05
+ */
+@Controller
+@RequestMapping("/orders/change")
+public class ZcOrderCarChangeController extends BaseController
+{
+    private String prefix = "orders/change";
+
+    @Autowired
+    private IZcOrderCarChangeService zcOrderCarChangeService;
+
+    @RequiresPermissions("orders:change:view")
+    @GetMapping()
+    public String change()
+    {
+        return prefix + "/change";
+    }
+
+    /**
+     * 查询订单车辆变更列表
+     */
+    @RequiresPermissions("orders:change:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ZcOrderCarChange zcOrderCarChange)
+    {
+        startPage();
+        List<ZcOrderCarChange> list = zcOrderCarChangeService.selectZcOrderCarChangeList(zcOrderCarChange);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出订单车辆变更列表
+     */
+    @RequiresPermissions("orders:change:export")
+    @Log(title = "订单车辆变更", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(ZcOrderCarChange zcOrderCarChange)
+    {
+        List<ZcOrderCarChange> list = zcOrderCarChangeService.selectZcOrderCarChangeList(zcOrderCarChange);
+        ExcelUtil<ZcOrderCarChange> util = new ExcelUtil<ZcOrderCarChange>(ZcOrderCarChange.class);
+        return util.exportExcel(list, "订单车辆变更数据");
+    }
+
+    /**
+     * 新增订单车辆变更
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存订单车辆变更
+     */
+    @RequiresPermissions("orders:change:add")
+    @Log(title = "订单车辆变更", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ZcOrderCarChange zcOrderCarChange)
+    {
+        return toAjax(zcOrderCarChangeService.insertZcOrderCarChange(zcOrderCarChange));
+    }
+
+    /**
+     * 修改订单车辆变更
+     */
+    @RequiresPermissions("orders:change:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        ZcOrderCarChange zcOrderCarChange = zcOrderCarChangeService.selectZcOrderCarChangeById(id);
+        mmap.put("zcOrderCarChange", zcOrderCarChange);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存订单车辆变更
+     */
+    @RequiresPermissions("orders:change:edit")
+    @Log(title = "订单车辆变更", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ZcOrderCarChange zcOrderCarChange)
+    {
+        return toAjax(zcOrderCarChangeService.updateZcOrderCarChange(zcOrderCarChange));
+    }
+
+    /**
+     * 删除订单车辆变更
+     */
+    @RequiresPermissions("orders:change:remove")
+    @Log(title = "订单车辆变更", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(zcOrderCarChangeService.deleteZcOrderCarChangeByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/orders/controller/ZcOrderMainController.java

@@ -7,6 +7,8 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.operation.domain.Company;
 import com.ruoyi.operation.service.ICompanyService;
+import com.ruoyi.orders.domain.ZcOrderCarChange;
+import com.ruoyi.orders.service.IZcOrderCarChangeService;
 import com.ruoyi.orders.util.OrderStatusEnum;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +43,8 @@ public class ZcOrderMainController extends BaseController
     @Autowired
     private IZcOrderMainService zcOrderMainService;
     @Autowired
+    private IZcOrderCarChangeService zcOrderCarChangeService;
+    @Autowired
     private ICompanyService companyService;
 
     @RequiresPermissions("orders:order:view")
@@ -119,6 +123,10 @@ public class ZcOrderMainController extends BaseController
         mmap.put("zcOrderMain", zcOrderMain);
         ZcOrderMain zcOrderMainImg = zcOrderMainService.selectZcOrderMainImgByOrderId(orderId);
         mmap.put("zcOrderMainImg", zcOrderMainImg);
+        ZcOrderCarChange zcOrderCarChange = new ZcOrderCarChange();
+        zcOrderCarChange.setOrderId(orderId);
+        List<ZcOrderCarChange> changeList = zcOrderCarChangeService.selectZcOrderCarChangeList(zcOrderCarChange);
+        mmap.put("zcOrderCarChangeList", changeList);
         return prefix + "/edit";
     }
 

ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderCarChange.java

@@ -0,0 +1,164 @@
+package com.ruoyi.orders.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 订单车辆变更对象 zc_order_car_change
+ * 
+ * @author ruoyi
+ * @date 2025-09-05
+ */
+public class ZcOrderCarChange extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID（主键） */
+    private Long id;
+
+    /** 关联的订单ID（外键） */
+    @Excel(name = "关联的订单ID", readConverterExp = "外=键")
+    private Long orderId;
+
+    /** 订单编号 */
+    @Excel(name = "订单编号")
+    private String orderNo;
+
+    /** 子订单编号 */
+    @Excel(name = "子订单编号")
+    private String orderSubNo;
+
+    /** 原车辆ID */
+    @Excel(name = "原车辆ID")
+    private Long oldVehicleId;
+
+    /** 原车车架号 */
+    @Excel(name = "原车车架号")
+    private String oldVehicleVin;
+
+    /** 新车辆ID */
+    @Excel(name = "新车辆ID")
+    private Long newVehicleId;
+
+    /** 新车车架号 */
+    @Excel(name = "新车车架号")
+    private String newVehicleVin;
+
+    /** 操作人id */
+    @Excel(name = "操作人id")
+    private Long operatorId;
+
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setOrderId(Long orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public Long getOrderId() 
+    {
+        return orderId;
+    }
+    public void setOrderNo(String orderNo) 
+    {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrderNo() 
+    {
+        return orderNo;
+    }
+    public void setOrderSubNo(String orderSubNo) 
+    {
+        this.orderSubNo = orderSubNo;
+    }
+
+    public String getOrderSubNo() 
+    {
+        return orderSubNo;
+    }
+    public void setOldVehicleId(Long oldVehicleId) 
+    {
+        this.oldVehicleId = oldVehicleId;
+    }
+
+    public Long getOldVehicleId() 
+    {
+        return oldVehicleId;
+    }
+    public void setOldVehicleVin(String oldVehicleVin) 
+    {
+        this.oldVehicleVin = oldVehicleVin;
+    }
+
+    public String getOldVehicleVin() 
+    {
+        return oldVehicleVin;
+    }
+    public void setNewVehicleId(Long newVehicleId) 
+    {
+        this.newVehicleId = newVehicleId;
+    }
+
+    public Long getNewVehicleId() 
+    {
+        return newVehicleId;
+    }
+    public void setNewVehicleVin(String newVehicleVin) 
+    {
+        this.newVehicleVin = newVehicleVin;
+    }
+
+    public String getNewVehicleVin() 
+    {
+        return newVehicleVin;
+    }
+    public void setOperatorId(Long operatorId) 
+    {
+        this.operatorId = operatorId;
+    }
+
+    public Long getOperatorId() 
+    {
+        return operatorId;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("orderId", getOrderId())
+            .append("orderNo", getOrderNo())
+            .append("orderSubNo", getOrderSubNo())
+            .append("oldVehicleId", getOldVehicleId())
+            .append("oldVehicleVin", getOldVehicleVin())
+            .append("newVehicleId", getNewVehicleId())
+            .append("newVehicleVin", getNewVehicleVin())
+            .append("operatorId", getOperatorId())
+            .append("delFlag", getDelFlag())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/orders/mapper/ZcOrderCarChangeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.orders.mapper;
+
+import java.util.List;
+import com.ruoyi.orders.domain.ZcOrderCarChange;
+
+/**
+ * 订单车辆变更Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-05
+ */
+public interface ZcOrderCarChangeMapper 
+{
+    /**
+     * 查询订单车辆变更
+     * 
+     * @param id 订单车辆变更主键
+     * @return 订单车辆变更
+     */
+    public ZcOrderCarChange selectZcOrderCarChangeById(Long id);
+
+    /**
+     * 查询订单车辆变更列表
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 订单车辆变更集合
+     */
+    public List<ZcOrderCarChange> selectZcOrderCarChangeList(ZcOrderCarChange zcOrderCarChange);
+
+    /**
+     * 新增订单车辆变更
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 结果
+     */
+    public int insertZcOrderCarChange(ZcOrderCarChange zcOrderCarChange);
+
+    /**
+     * 修改订单车辆变更
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 结果
+     */
+    public int updateZcOrderCarChange(ZcOrderCarChange zcOrderCarChange);
+
+    /**
+     * 删除订单车辆变更
+     * 
+     * @param id 订单车辆变更主键
+     * @return 结果
+     */
+    public int deleteZcOrderCarChangeById(Long id);
+
+    /**
+     * 批量删除订单车辆变更
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZcOrderCarChangeByIds(String[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/orders/service/IZcOrderCarChangeService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.orders.service;
+
+import java.util.List;
+import com.ruoyi.orders.domain.ZcOrderCarChange;
+
+/**
+ * 订单车辆变更Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-09-05
+ */
+public interface IZcOrderCarChangeService 
+{
+    /**
+     * 查询订单车辆变更
+     * 
+     * @param id 订单车辆变更主键
+     * @return 订单车辆变更
+     */
+    public ZcOrderCarChange selectZcOrderCarChangeById(Long id);
+
+    /**
+     * 查询订单车辆变更列表
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 订单车辆变更集合
+     */
+    public List<ZcOrderCarChange> selectZcOrderCarChangeList(ZcOrderCarChange zcOrderCarChange);
+
+    /**
+     * 新增订单车辆变更
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 结果
+     */
+    public int insertZcOrderCarChange(ZcOrderCarChange zcOrderCarChange);
+
+    /**
+     * 修改订单车辆变更
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 结果
+     */
+    public int updateZcOrderCarChange(ZcOrderCarChange zcOrderCarChange);
+
+    /**
+     * 批量删除订单车辆变更
+     * 
+     * @param ids 需要删除的订单车辆变更主键集合
+     * @return 结果
+     */
+    public int deleteZcOrderCarChangeByIds(String ids);
+
+    /**
+     * 删除订单车辆变更信息
+     * 
+     * @param id 订单车辆变更主键
+     * @return 结果
+     */
+    public int deleteZcOrderCarChangeById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/orders/service/impl/ZcOrderCarChangeServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.orders.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.orders.mapper.ZcOrderCarChangeMapper;
+import com.ruoyi.orders.domain.ZcOrderCarChange;
+import com.ruoyi.orders.service.IZcOrderCarChangeService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 订单车辆变更Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-09-05
+ */
+@Service
+public class ZcOrderCarChangeServiceImpl implements IZcOrderCarChangeService 
+{
+    @Autowired
+    private ZcOrderCarChangeMapper zcOrderCarChangeMapper;
+
+    /**
+     * 查询订单车辆变更
+     * 
+     * @param id 订单车辆变更主键
+     * @return 订单车辆变更
+     */
+    @Override
+    public ZcOrderCarChange selectZcOrderCarChangeById(Long id)
+    {
+        return zcOrderCarChangeMapper.selectZcOrderCarChangeById(id);
+    }
+
+    /**
+     * 查询订单车辆变更列表
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 订单车辆变更
+     */
+    @Override
+    public List<ZcOrderCarChange> selectZcOrderCarChangeList(ZcOrderCarChange zcOrderCarChange)
+    {
+        return zcOrderCarChangeMapper.selectZcOrderCarChangeList(zcOrderCarChange);
+    }
+
+    /**
+     * 新增订单车辆变更
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 结果
+     */
+    @Override
+    public int insertZcOrderCarChange(ZcOrderCarChange zcOrderCarChange)
+    {
+        zcOrderCarChange.setCreateTime(DateUtils.getNowDate());
+        return zcOrderCarChangeMapper.insertZcOrderCarChange(zcOrderCarChange);
+    }
+
+    /**
+     * 修改订单车辆变更
+     * 
+     * @param zcOrderCarChange 订单车辆变更
+     * @return 结果
+     */
+    @Override
+    public int updateZcOrderCarChange(ZcOrderCarChange zcOrderCarChange)
+    {
+        zcOrderCarChange.setUpdateTime(DateUtils.getNowDate());
+        return zcOrderCarChangeMapper.updateZcOrderCarChange(zcOrderCarChange);
+    }
+
+    /**
+     * 批量删除订单车辆变更
+     * 
+     * @param ids 需要删除的订单车辆变更主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZcOrderCarChangeByIds(String ids)
+    {
+        return zcOrderCarChangeMapper.deleteZcOrderCarChangeByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除订单车辆变更信息
+     * 
+     * @param id 订单车辆变更主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZcOrderCarChangeById(Long id)
+    {
+        return zcOrderCarChangeMapper.deleteZcOrderCarChangeById(id);
+    }
+}