diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java index e2d77eef..40709273 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BizMaintenanceOrderController.java @@ -1,388 +1,145 @@ package com.ruoyi.web.controller.tyre; import java.util.List; -import java.util.stream.Collectors; - -import com.ruoyi.common.utils.ShiroUtils; -import com.ruoyi.common.utils.file.MimeTypeUtils; -import com.ruoyi.common.utils.uuid.Seq; -import com.ruoyi.system.domain.BaseCar; -import com.ruoyi.system.service.IBaseCarService; 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 org.springframework.web.multipart.MultipartFile; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.config.ServerConfig; import com.ruoyi.system.domain.BizMaintenanceOrder; -import com.ruoyi.system.domain.BizOrderTireDetail; -import com.ruoyi.system.domain.SysAttachment; -import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.system.service.IBizMaintenanceOrderService; -import com.ruoyi.system.service.IBizOrderTireDetailService; -import com.ruoyi.system.service.ISysAttachmentService; -import com.ruoyi.system.service.ISysDeptService; 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 yangwanli - * @date 2026-04-15 + * 维保工单Controller + * + * @author yangwl + * @date 2026-04-16 */ @Controller @RequestMapping("/tyre/order") -public class BizMaintenanceOrderController extends BaseController { +public class BizMaintenanceOrderController extends BaseController +{ private String prefix = "tyre/order"; @Autowired private IBizMaintenanceOrderService bizMaintenanceOrderService; - @Autowired - private ISysAttachmentService sysAttachmentService; - - @Autowired - private ISysDeptService deptService; - - @Autowired - private IBaseCarService baseCarService; - - @Autowired - private IBizOrderTireDetailService tireDetailService; - - @Autowired - private ServerConfig serverConfig; - @RequiresPermissions("system:order:view") @GetMapping() - public String order() { + public String order() + { return prefix + "/order"; } /** - * 查询维保工单主表列表 + * 查询所有工单列表 */ @RequiresPermissions("system:order:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(BizMaintenanceOrder bizMaintenanceOrder) { + public TableDataInfo list(BizMaintenanceOrder bizMaintenanceOrder) + { startPage(); - List list = bizMaintenanceOrderService.selectBizRepairOrderList(bizMaintenanceOrder); + List list = bizMaintenanceOrderService.selectBizMaintenanceOrderList(bizMaintenanceOrder); return getDataTable(list); } /** - * 导出维保工单主表列表 + * 查询维保工单列表 + */ + @RequiresPermissions("system:order:list") + @PostMapping("/listMaintenanceOrder") + @ResponseBody + public TableDataInfo listMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder) + { + startPage(); + List list = bizMaintenanceOrderService.selectBizMaintenanceOrderListTwo(bizMaintenanceOrder); + return getDataTable(list); + } + + /** + * 导出维保工单列表 */ @RequiresPermissions("system:order:export") - @Log(title = "维保工单主表", businessType = BusinessType.EXPORT) + @Log(title = "维保工单", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(BizMaintenanceOrder bizMaintenanceOrder) { + public AjaxResult export(BizMaintenanceOrder bizMaintenanceOrder) + { List list = bizMaintenanceOrderService.selectBizMaintenanceOrderList(bizMaintenanceOrder); ExcelUtil util = new ExcelUtil(BizMaintenanceOrder.class); return util.exportExcel(list, "维保工单数据"); } /** - * 新增维保工单主表 + * 新增维保工单 */ @RequiresPermissions("system:order:add") @GetMapping("/add") - public String add(ModelMap mmap) { - BizMaintenanceOrder bizMaintenanceOrder = new BizMaintenanceOrder(); - bizMaintenanceOrder.setOrderType("1"); // 汽车类型 - mmap.put("bizMaintenanceOrder", bizMaintenanceOrder); + public String add() + { return prefix + "/add"; } /** - * 新增保存维保工单主表 + * 新增保存维保工单 */ @RequiresPermissions("system:order:add") - @Log(title = "维保工单主表", businessType = BusinessType.INSERT) + @Log(title = "维保工单", businessType = BusinessType.INSERT) @PostMapping("/add") @ResponseBody - public AjaxResult addSave(BizMaintenanceOrder bizMaintenanceOrder) { + public AjaxResult addSave(BizMaintenanceOrder bizMaintenanceOrder) + { return toAjax(bizMaintenanceOrderService.insertBizMaintenanceOrder(bizMaintenanceOrder)); } /** - * 修改维保工单主表 + * 修改维保工单 */ @RequiresPermissions("system:order:edit") @GetMapping("/edit/{orderId}") - public String edit(@PathVariable("orderId") Long orderId, ModelMap mmap) { - BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderService.selectBizMaintenanceOrderById(orderId); - // 查询工单关联的附件（图片） - List attachments = sysAttachmentService.selectAttachmentsByOrderId(orderId); + public String edit(@PathVariable("orderId") Long orderId, ModelMap mmap) + { + BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderService.selectBizMaintenanceOrderByOrderId(orderId); mmap.put("bizMaintenanceOrder", bizMaintenanceOrder); - mmap.put("attachments", attachments); return prefix + "/edit"; } /** - * 修改保存维保工单主表 + * 修改保存维保工单 */ @RequiresPermissions("system:order:edit") - @Log(title = "维保工单主表", businessType = BusinessType.UPDATE) + @Log(title = "维保工单", businessType = BusinessType.UPDATE) @PostMapping("/edit") @ResponseBody - public AjaxResult editSave(BizMaintenanceOrder bizMaintenanceOrder, String attachmentUrls) { - // 更新工单 - int result = bizMaintenanceOrderService.updateBizMaintenanceOrder(bizMaintenanceOrder); - - if (result > 0 && bizMaintenanceOrder.getOrderId() != null) { - // 先删除该工单的所有附件记录 - sysAttachmentService.deleteAttachmentsByOrderId(bizMaintenanceOrder.getOrderId()); - - // 重新插入新的附件记录 - if (attachmentUrls != null && !attachmentUrls.trim().isEmpty()) { - String[] urls = attachmentUrls.split(","); - for (String url : urls) { - if (url != null && !url.trim().isEmpty()) { - SysAttachment attachment = new SysAttachment(); - String fileName = url.substring(url.lastIndexOf("/") + 1); - attachment.setFileName(fileName); - attachment.setFilePath(url); - attachment.setOrderId(bizMaintenanceOrder.getOrderId()); - attachment.setUploadBy(ShiroUtils.getLoginName()); - sysAttachmentService.insertSysAttachment(attachment); - } - } - } - } - - return toAjax(result); + public AjaxResult editSave(BizMaintenanceOrder bizMaintenanceOrder) + { + return toAjax(bizMaintenanceOrderService.updateBizMaintenanceOrder(bizMaintenanceOrder)); } /** - * 删除维保工单主表 + * 删除维保工单 */ @RequiresPermissions("system:order:remove") - @Log(title = "维保工单主表", businessType = BusinessType.DELETE) - @PostMapping("/remove") + @Log(title = "维保工单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") @ResponseBody - public AjaxResult remove(String ids) { - return toAjax(bizMaintenanceOrderService.deleteBizMaintenanceOrderByIds(ids)); + public AjaxResult remove(String ids) + { + return toAjax(bizMaintenanceOrderService.deleteBizMaintenanceOrderByOrderIds(ids)); } - - /** - * 查看维保工单详情 - */ - @RequiresPermissions("system:order:view") - @GetMapping("/detail/{orderId}") - public String detail(@PathVariable("orderId") Long orderId, ModelMap mmap) { - BizMaintenanceOrder bizMaintenanceOrder = bizMaintenanceOrderService.selectBizMaintenanceOrderById(orderId); - // 查询工单关联的附件（图片） - List attachments = sysAttachmentService.selectAttachmentsByOrderId(orderId); - // 查询工单关联的轮胎明细 - List tireDetails = tireDetailService.selectTireDetailByOrderId(orderId); - mmap.put("bizMaintenanceOrder", bizMaintenanceOrder); - mmap.put("attachments", attachments); - mmap.put("tireDetails", tireDetails); - return prefix + "/detail"; - } - - /** - * 根据车牌号查询工单 - */ - @PostMapping("/queryByPlate") + @PostMapping("/PDAGetMaintenanceOrder") @ResponseBody - public AjaxResult queryByPlate(String plateNumber) { - List list = bizMaintenanceOrderService.selectOrderByPlateNumber(plateNumber); + public AjaxResult PDAGetMaintenanceOrder(@RequestBody BizMaintenanceOrder bizMaintenanceOrder) + { + List list = bizMaintenanceOrderService.selectBizMaintenanceOrderList(bizMaintenanceOrder); return AjaxResult.success(list); } - /** - * 根据轮胎编号查询工单 - */ - @PostMapping("/queryByTireCode") - @ResponseBody - public AjaxResult queryByTireCode(String tireCode) { - List list = bizMaintenanceOrderService.selectOrderByTireCode(tireCode); - return AjaxResult.success(list); - } - - /** - * 更新工单状态 - */ - @RequiresPermissions("system:order:edit") - @PostMapping("/updateStatus") - @ResponseBody - public AjaxResult updateStatus(Long orderId, String status) { - int result = bizMaintenanceOrderService.updateOrderStatus(orderId, status); - return toAjax(result); - } - - /** - * 提交工单（提交页面） - */ - @RequiresPermissions("system:order:submit") - @GetMapping("/submit") - public String submit(ModelMap mmap) { - BizMaintenanceOrder bizMaintenanceOrder = new BizMaintenanceOrder(); - bizMaintenanceOrder.setOrderType("1"); // 汽车类型 - bizMaintenanceOrder.setStatus("UNSTARTED"); // 未开始状态 - mmap.put("bizMaintenanceOrder", bizMaintenanceOrder); - mmap.put("depts", deptService.selectDeptList(new SysDept())); - mmap.put("cars", baseCarService.selectBaseCarList(new BaseCar())); - return prefix + "/submit"; - } - - /** - * 保存工单及图片上传 - */ - @RequiresPermissions("system:order:submit") - @Log(title = "提交工单", businessType = BusinessType.INSERT) - @PostMapping("/submit") - @ResponseBody - public AjaxResult submitSave(BizMaintenanceOrder bizMaintenanceOrder, String attachmentUrls) { - // 设置创建人 - bizMaintenanceOrder.setCreateBy(ShiroUtils.getLoginName()); - bizMaintenanceOrder.setOrderNo(Seq.getId(Seq.orderSeqType)); - // 设置工单类型为汽车类型 - bizMaintenanceOrder.setOrderType("1"); - // 插入工单 - int result = bizMaintenanceOrderService.insertBizMaintenanceOrder(bizMaintenanceOrder); - - if (result > 0 && bizMaintenanceOrder.getOrderId() != null && attachmentUrls != null && !attachmentUrls.trim().isEmpty()) { - // 处理图片上传 - String[] urls = attachmentUrls.split(","); - for (String url : urls) { - if (url != null && !url.trim().isEmpty()) { - SysAttachment attachment = new SysAttachment(); - // 提取文件名 - String fileName = url.substring(url.lastIndexOf("/") + 1); - attachment.setFileName(fileName); - attachment.setFilePath(url); - attachment.setOrderId(bizMaintenanceOrder.getOrderId()); - attachment.setUploadBy(ShiroUtils.getLoginName()); - sysAttachmentService.insertSysAttachment(attachment); - } - } - } - - return toAjax(result); - } - - /** - * 上传工单图片（WebUploader专用） - */ - @Log(title = "上传工单图片", businessType = BusinessType.OTHER) - @PostMapping("/uploadImage") - @ResponseBody - public AjaxResult uploadImage(MultipartFile file) { - try { - String imagePath = FileUploadUtils.upload(RuoYiConfig.getUploadPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); - - // 上传路径 -// String uploadPath = RuoYiConfig.getUploadPath(); -// // 上传并返回新文件名称 -// String fileName = FileUploadUtils.upload(uploadPath, file); -// String url = serverConfig.getUrl() + fileName; - // WebUploader要求的返回格式 - AjaxResult ajax = AjaxResult.success(); - ajax.put("url", imagePath); - ajax.put("fileName", imagePath); - ajax.put("code", 0); - ajax.put("msg", "上传成功"); - return ajax; - } catch (Exception e) { - AjaxResult ajax = AjaxResult.error("图片上传失败: " + e.getMessage()); - ajax.put("code", 1); - return ajax; - } - } - - /** - * 删除工单图片 - */ - @Log(title = "删除工单图片", businessType = BusinessType.DELETE) - @PostMapping("/deleteImage") - @ResponseBody - public AjaxResult deleteImage(String filePath) { - try { - // 从完整URL中提取文件名 - String fileName = StringUtils.substringAfterLast(filePath, "/"); - if (StringUtils.isNotEmpty(fileName)) { - // 构建完整文件路径 - String fullPath = RuoYiConfig.getUploadPath() + StringUtils.substringAfter(filePath, Constants.RESOURCE_PREFIX); - FileUtils.deleteFile(fullPath); - return AjaxResult.success("图片删除成功"); - } - return AjaxResult.error("文件路径无效"); - } catch (Exception e) { - return AjaxResult.error("图片删除失败: " + e.getMessage()); - } - } - - /** - * 获取工单图片列表 - */ - @GetMapping("/getOrderImages") - @ResponseBody - public AjaxResult getOrderImages(Long orderId) { - List attachments = sysAttachmentService.selectAttachmentsByOrderId(orderId); - return AjaxResult.success(attachments); - } - - /** - * 获取执行站点列表 - */ - @GetMapping("/getFactoryList") - @ResponseBody - public AjaxResult getFactoryList() { - // 获取部门列表 - SysDept queryDept = new SysDept(); - queryDept.setParentId(227L); - List deptList = deptService.selectDeptList(queryDept); - return AjaxResult.success(deptList); - } - - /** - * 获取执行站点列表 - */ - @GetMapping("/getCarList") - @ResponseBody - public AjaxResult getCarList() { - // 获取部门列表 - List carList = baseCarService.selectBaseCarList(new BaseCar()); - return AjaxResult.success(carList); - } - - - @RequiresPermissions("system:order:scrapView") - @GetMapping("/scrapOrder") - public String scrapOrder() { - return prefix + "/scrapOrder"; - } - - /** - * 查询维保工单主表列表 - */ - @RequiresPermissions("system:order:scrapList") - @PostMapping("/listScrap") - @ResponseBody - public TableDataInfo listScrap(BizMaintenanceOrder bizMaintenanceOrder) { - startPage(); - List list = bizMaintenanceOrderService.selectBizScrapOrderList(bizMaintenanceOrder); - return getDataTable(list); - } - -} \ No newline at end of file +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/TireMaintenanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/TireMaintenanceController.java index 46aeff34..a66de88b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/TireMaintenanceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/TireMaintenanceController.java @@ -3,6 +3,9 @@ package com.ruoyi.web.controller.tyre; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; + +import com.ruoyi.system.domain.BizMaintenanceOrder; +import com.ruoyi.system.service.IBizMaintenanceOrderService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -12,13 +15,7 @@ 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.system.domain.TireMaintenance; -import com.ruoyi.system.service.ITireMaintenanceService; 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; /** @@ -34,7 +31,7 @@ public class TireMaintenanceController extends BaseController private String prefix = "tyre/maintenance"; @Autowired - private ITireMaintenanceService tireMaintenanceService; + private IBizMaintenanceOrderService bizMaintenanceOrderService; @RequiresPermissions("system:maintenance:view") @GetMapping() @@ -49,94 +46,82 @@ public class TireMaintenanceController extends BaseController @RequiresPermissions("system:maintenance:list") @PostMapping("/list") @ResponseBody - public TableDataInfo list(TireMaintenance tireMaintenance) + public TableDataInfo list(BizMaintenanceOrder bizMaintenanceOrder) { startPage(); - // --- 模拟数据开始 (实际开发请调用 service.selectTireMaintenanceList(maintenance)) --- - List mockList = new ArrayList<>(); - TireMaintenance t1 = new TireMaintenance(); - t1.setId(1L); t1.setPlateNumber("粤B-12345"); t1.setMaintType("二级保养"); - t1.setMaintStation("南山修理厂"); t1.setMaintDate(java.sql.Date.valueOf("2026-04-09")); - t1.setMileage(new BigDecimal(50000)); t1.setStatus("0"); t1.setProject("常规检查"); - mockList.add(t1); - - TireMaintenance t2 = new TireMaintenance(); - t2.setId(2L); t2.setPlateNumber("粤B-67890"); t2.setMaintType("抢碎修"); - t2.setMaintStation("福田快修"); t2.setMaintDate(java.sql.Date.valueOf("2026-04-08")); - t2.setMileage(new BigDecimal(42000)); t2.setStatus("1"); t2.setProject("轮胎修补"); - mockList.add(t2); - return getDataTable(mockList); + List list = bizMaintenanceOrderService.selectBizMaintenanceOrderList(bizMaintenanceOrder); + return getDataTable(list); } - /** - * 导出车辆维保记录列表 - */ - @RequiresPermissions("system:maintenance:export") - @Log(title = "车辆维保记录", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(TireMaintenance tireMaintenance) - { - List list = tireMaintenanceService.selectTireMaintenanceList(tireMaintenance); - ExcelUtil util = new ExcelUtil(TireMaintenance.class); - return util.exportExcel(list, "车辆维保记录数据"); - } - - /** - * 新增车辆维保记录 - */ - @RequiresPermissions("system:maintenance:add") - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存车辆维保记录 - */ - @RequiresPermissions("system:maintenance:add") - @Log(title = "车辆维保记录", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(TireMaintenance tireMaintenance) - { - return toAjax(tireMaintenanceService.insertTireMaintenance(tireMaintenance)); - } - - /** - * 修改车辆维保记录 - */ - @RequiresPermissions("system:maintenance:edit") - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") Long id, ModelMap mmap) - { - TireMaintenance tireMaintenance = tireMaintenanceService.selectTireMaintenanceById(id); - mmap.put("tireMaintenance", tireMaintenance); - return prefix + "/edit"; - } - - /** - * 修改保存车辆维保记录 - */ - @RequiresPermissions("system:maintenance:edit") - @Log(title = "车辆维保记录", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(TireMaintenance tireMaintenance) - { - return toAjax(tireMaintenanceService.updateTireMaintenance(tireMaintenance)); - } - - /** - * 删除车辆维保记录 - */ - @RequiresPermissions("system:maintenance:remove") - @Log(title = "车辆维保记录", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(tireMaintenanceService.deleteTireMaintenanceByIds(ids)); - } +// /** +// * 导出车辆维保记录列表 +// */ +// @RequiresPermissions("system:maintenance:export") +// @Log(title = "车辆维保记录", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// @ResponseBody +// public AjaxResult export(TireMaintenance tireMaintenance) +// { +// List list = tireMaintenanceService.selectTireMaintenanceList(tireMaintenance); +// ExcelUtil util = new ExcelUtil(TireMaintenance.class); +// return util.exportExcel(list, "车辆维保记录数据"); +// } +// +// /** +// * 新增车辆维保记录 +// */ +// @RequiresPermissions("system:maintenance:add") +// @GetMapping("/add") +// public String add() +// { +// return prefix + "/add"; +// } +// +// /** +// * 新增保存车辆维保记录 +// */ +// @RequiresPermissions("system:maintenance:add") +// @Log(title = "车辆维保记录", businessType = BusinessType.INSERT) +// @PostMapping("/add") +// @ResponseBody +// public AjaxResult addSave(TireMaintenance tireMaintenance) +// { +// return toAjax(tireMaintenanceService.insertTireMaintenance(tireMaintenance)); +// } +// +// /** +// * 修改车辆维保记录 +// */ +// @RequiresPermissions("system:maintenance:edit") +// @GetMapping("/edit/{id}") +// public String edit(@PathVariable("id") Long id, ModelMap mmap) +// { +// TireMaintenance tireMaintenance = tireMaintenanceService.selectTireMaintenanceById(id); +// mmap.put("tireMaintenance", tireMaintenance); +// return prefix + "/edit"; +// } +// +// /** +// * 修改保存车辆维保记录 +// */ +// @RequiresPermissions("system:maintenance:edit") +// @Log(title = "车辆维保记录", businessType = BusinessType.UPDATE) +// @PostMapping("/edit") +// @ResponseBody +// public AjaxResult editSave(TireMaintenance tireMaintenance) +// { +// return toAjax(tireMaintenanceService.updateTireMaintenance(tireMaintenance)); +// } +// +// /** +// * 删除车辆维保记录 +// */ +// @RequiresPermissions("system:maintenance:remove") +// @Log(title = "车辆维保记录", businessType = BusinessType.DELETE) +// @PostMapping( "/remove") +// @ResponseBody +// public AjaxResult remove(String ids) +// { +// return toAjax(tireMaintenanceService.deleteTireMaintenanceByIds(ids)); +// } } diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index e7bbdc93..c72623e0 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -27,7 +27,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/tyre/maintenance/maintenance.html b/ruoyi-admin/src/main/resources/templates/tyre/maintenance/maintenance.html index ecb60db9..6a291eb8 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/maintenance/maintenance.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/maintenance/maintenance.html @@ -1,143 +1,209 @@ - + -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - 维保类型： +
    • +
  • + + +
    • +
  • + + -
    • -
  • - 维保项目： -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- -
-
-
+ +
  • + + + +
    • +
  • +  搜索 +  重置 +
    • + +
    + +
    + +
    + + 提交工单 + + + + + + + + + + + + + +
    +
    +
    - - + + // 提交工单新窗口 + $.operate.openNewWindow = function(url) { + if (url === 'submit') { + $.modal.open("提交工单", prefix + "/submit", "800", "600"); + } else { + $.modal.open("详情查看", url, "900", "700"); + } + }; + + }); + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/order/add.html b/ruoyi-admin/src/main/resources/templates/tyre/order/add.html new file mode 100644 index 00000000..69a7538f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/tyre/order/add.html @@ -0,0 +1,136 @@ + + + + + + + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/order/detail.html b/ruoyi-admin/src/main/resources/templates/tyre/order/detail.html deleted file mode 100644 index 3edc839a..00000000 --- a/ruoyi-admin/src/main/resources/templates/tyre/order/detail.html +++ /dev/null @@ -1,225 +0,0 @@ - - - - - - - -
    - -
    -
    -

    基本信息

    -
    -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -

    轮胎信息

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    序号轮胎编号轮胎位置品牌型号花纹深度(mm)状态描述
    -
    -
    -

    暂无轮胎信息

    -
    -
    -
    - - -
    - - - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/order/edit.html b/ruoyi-admin/src/main/resources/templates/tyre/order/edit.html index d842c65d..360280c8 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/order/edit.html @@ -1,447 +1,129 @@ - + - + - - - -
    -
    - - - - - -
    - -
    - -
    -
    - - - - - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - - -
    - -
    -
    - - +
    + + +
    +
    + +
    + +
    -
    - - -
    - -
    - +
    +
    + +
    + +
    +
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - +
    +
    + +
    + +
    +
    -
    - -
    - - - - - - - + - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/order/order.html b/ruoyi-admin/src/main/resources/templates/tyre/order/order.html index a7bcd1fd..09809b8b 100644 --- a/ruoyi-admin/src/main/resources/templates/tyre/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/tyre/order/order.html @@ -1,7 +1,7 @@ - +
    @@ -10,10 +10,6 @@
      -
    • - - -
    • @@ -22,17 +18,23 @@ -
      • +
    • + + +
      • + + + +
    • -
    •  搜索 @@ -44,21 +46,18 @@
    @@ -69,25 +68,18 @@ diff --git a/ruoyi-admin/src/main/resources/templates/tyre/order/scrapOrder.html b/ruoyi-admin/src/main/resources/templates/tyre/order/scrapOrder.html deleted file mode 100644 index a228a5ba..00000000 --- a/ruoyi-admin/src/main/resources/templates/tyre/order/scrapOrder.html +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - -
    -
    -
    - -
    -
      -
    • - - -
      • -
    • - - -
      • -
    • - - - -
      • -
    • -  搜索 -  重置 -
      • -
    -
    - -
    - -
    - - - - - - - - - - - - - - - -
    -
    -
    -
    -
    -
    - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/tyre/order/submit.html b/ruoyi-admin/src/main/resources/templates/tyre/order/submit.html deleted file mode 100644 index 93351a11..00000000 --- a/ruoyi-admin/src/main/resources/templates/tyre/order/submit.html +++ /dev/null @@ -1,373 +0,0 @@ - - - - - - - - - - -
    -
    - - - - - -
    - -
    - -
    -
    - - - - - -
    - -
    - - -
    -
    - - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - - -
    - -
    -
    - - -
    -
    -
    - - -
    - -
    - -
    -
    - - - - - - - - - - - - - - - -
    -
    - - -
    -
    -
    -
    - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index 0620a0be..04a38ad9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -344,6 +344,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/tyre/car/queryCarByRfid", "anon,captchaValidate"); filterChainDefinitionMap.put("/system/package/checkUpdate", "anon,captchaValidate"); filterChainDefinitionMap.put("/common/downloadApk", "anon,captchaValidate"); + filterChainDefinitionMap.put("/tyre/order/PDAGetMaintenanceOrder", "anon,captchaValidate"); // 系统权限列表 // filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizMaintenanceOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizMaintenanceOrder.java index ea6b6f2d..3abb57b4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizMaintenanceOrder.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BizMaintenanceOrder.java @@ -2,8 +2,6 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; import java.util.Date; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,10 +9,10 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 维保工单主表对象 biz_maintenance_order + * 维保工单对象 biz_maintenance_order * - * @author xins - * @date 2026-04-15 + * @author yangwl + * @date 2026-04-16 */ public class BizMaintenanceOrder extends BaseEntity { @@ -32,7 +30,7 @@ public class BizMaintenanceOrder extends BaseEntity private Long vehicleId; /** 车牌号码（冗余字段，便于查询） */ - @Excel(name = "车牌号码", readConverterExp = "冗余字段，便于查询") + @Excel(name = "车牌号码", readConverterExp = "冗=余字段，便于查询") private String plateNumber; /** 维保类型（如：二级保养） */ @@ -44,15 +42,15 @@ public class BizMaintenanceOrder extends BaseEntity private Long factoryId; /** 仪表盘录入里程（截图中的必填项） */ - @Excel(name = "仪表盘录入里程", readConverterExp = "截图中的必填项") + @Excel(name = "仪表盘录入里程", readConverterExp = "截=图中的必填项") private BigDecimal inputMileage; /** 上次维保里程（快照） */ - @Excel(name = "上次维保里程", readConverterExp = "快照") + @Excel(name = "上次维保里程", readConverterExp = "快=照") private BigDecimal lastMileage; /** 保养日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @Excel(name = "保养日期", width = 30, dateFormat = "yyyy-MM-dd") private Date maintainDate; @@ -61,29 +59,13 @@ public class BizMaintenanceOrder extends BaseEntity private String description; /** 状态（UNSTARTED未开始, PROCESSING执行中, COMPLETED已完成） */ - @Excel(name = "状态", readConverterExp = "UNSTARTED未开始, PROCESSING执行中, COMPLETED已完成") + @Excel(name = "状态", readConverterExp = "U=NSTARTED未开始,,P=ROCESSING执行中,,C=OMPLETED已完成") private String status; /** 1代表汽车、2代表轮胎 */ @Excel(name = "1代表汽车、2代表轮胎") private String orderType; - /** 维修站点名称（扩展字段，用于显示） */ - @Excel(name = "维修站点") - private String factoryName; - - /** 维修人 */ - @Excel(name = "维修人") - private String maintainer; - - /** 维修日期 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "维修日期", width = 30, dateFormat = "yyyy-MM-dd") - private Date maintainerDate; - - /** 轮胎明细列表 */ - private List tireDetails; - public void setOrderId(Long orderId) { this.orderId = orderId; @@ -93,6 +75,7 @@ public class BizMaintenanceOrder extends BaseEntity { return orderId; } + public void setOrderNo(String orderNo) { this.orderNo = orderNo; @@ -102,6 +85,7 @@ public class BizMaintenanceOrder extends BaseEntity { return orderNo; } + public void setVehicleId(Long vehicleId) { this.vehicleId = vehicleId; @@ -111,6 +95,7 @@ public class BizMaintenanceOrder extends BaseEntity { return vehicleId; } + public void setPlateNumber(String plateNumber) { this.plateNumber = plateNumber; @@ -120,6 +105,7 @@ public class BizMaintenanceOrder extends BaseEntity { return plateNumber; } + public void setTypeCode(String typeCode) { this.typeCode = typeCode; @@ -129,6 +115,7 @@ public class BizMaintenanceOrder extends BaseEntity { return typeCode; } + public void setFactoryId(Long factoryId) { this.factoryId = factoryId; @@ -138,6 +125,7 @@ public class BizMaintenanceOrder extends BaseEntity { return factoryId; } + public void setInputMileage(BigDecimal inputMileage) { this.inputMileage = inputMileage; @@ -147,6 +135,7 @@ public class BizMaintenanceOrder extends BaseEntity { return inputMileage; } + public void setLastMileage(BigDecimal lastMileage) { this.lastMileage = lastMileage; @@ -156,6 +145,7 @@ public class BizMaintenanceOrder extends BaseEntity { return lastMileage; } + public void setMaintainDate(Date maintainDate) { this.maintainDate = maintainDate; @@ -165,6 +155,7 @@ public class BizMaintenanceOrder extends BaseEntity { return maintainDate; } + public void setDescription(String description) { this.description = description; @@ -174,6 +165,7 @@ public class BizMaintenanceOrder extends BaseEntity { return description; } + public void setStatus(String status) { this.status = status; @@ -183,6 +175,7 @@ public class BizMaintenanceOrder extends BaseEntity { return status; } + public void setOrderType(String orderType) { this.orderType = orderType; @@ -193,38 +186,6 @@ public class BizMaintenanceOrder extends BaseEntity return orderType; } - public String getFactoryName() { - return factoryName; - } - - public void setFactoryName(String factoryName) { - this.factoryName = factoryName; - } - - public String getMaintainer() { - return maintainer; - } - - public void setMaintainer(String maintainer) { - this.maintainer = maintainer; - } - - public Date getMaintainerDate() { - return maintainerDate; - } - - public void setMaintainerDate(Date maintainerDate) { - this.maintainerDate = maintainerDate; - } - - public List getTireDetails() { - return tireDetails; - } - - public void setTireDetails(List tireDetails) { - this.tireDetails = tireDetails; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -245,9 +206,6 @@ public class BizMaintenanceOrder extends BaseEntity .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) - .append("factoryName", getFactoryName()) - .append("maintainer", getMaintainer()) - .append("maintainerDate", getMaintainerDate()) .toString(); } -} \ No newline at end of file +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizMaintenanceOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizMaintenanceOrderMapper.java index 07d7bd1c..22f9ac84 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizMaintenanceOrderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BizMaintenanceOrderMapper.java @@ -4,109 +4,61 @@ import java.util.List; import com.ruoyi.system.domain.BizMaintenanceOrder; /** - * 维保工单主表Mapper接口 + * 维保工单Mapper接口 * - * @author yangwanli - * @date 2026-04-15 + * @author yangwl + * @date 2026-04-16 */ public interface BizMaintenanceOrderMapper { /** - * 查询维保工单主表 + * 查询维保工单 * - * @param orderId 维保工单主表主键 - * @return 维保工单主表 + * @param orderId 维保工单主键 + * @return 维保工单 */ - public BizMaintenanceOrder selectBizMaintenanceOrderById(Long orderId); + public BizMaintenanceOrder selectBizMaintenanceOrderByOrderId(Long orderId); /** - * 查询维保工单主表列表 + * 查询维保工单列表 * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表集合 + * @param bizMaintenanceOrder 维保工单 + * @return 维保工单集合 */ public List selectBizMaintenanceOrderList(BizMaintenanceOrder bizMaintenanceOrder); + public List selectBizMaintenanceOrderListTwo(BizMaintenanceOrder bizMaintenanceOrder); + + /** - * 新增维保工单主表 + * 新增维保工单 * - * @param bizMaintenanceOrder 维保工单主表 + * @param bizMaintenanceOrder 维保工单 * @return 结果 */ public int insertBizMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder); /** - * 修改维保工单主表 + * 修改维保工单 * - * @param bizMaintenanceOrder 维保工单主表 + * @param bizMaintenanceOrder 维保工单 * @return 结果 */ public int updateBizMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder); /** - * 删除维保工单主表 + * 删除维保工单 * - * @param orderId 维保工单主表主键 + * @param orderId 维保工单主键 * @return 结果 */ - public int deleteBizMaintenanceOrderById(Long orderId); + public int deleteBizMaintenanceOrderByOrderId(Long orderId); /** - * 批量删除维保工单主表 + * 批量删除维保工单 * * @param orderIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteBizMaintenanceOrderByIds(String[] orderIds); - - /** - * 查询工单数量 - * - * @param status 状态 - * @return 数量 - */ - public int selectOrderCountByStatus(String status); - - /** - * 根据车牌号查询工单列表 - * - * @param plateNumber 车牌号 - * @return 工单列表 - */ - public List selectOrderByPlateNumber(String plateNumber); - - /** - * 根据轮胎编号查询工单 - * - * @param tireCode 轮胎编号 - * @return 工单列表 - */ - public List selectOrderByTireCode(String tireCode); - - /** - * 更新工单状态 - * - * @param orderId 工单ID - * @param status 状态 - * @return 结果 - */ - public int updateOrderStatus(Long orderId, String status); - - /** - * 查询修补工单主表列表 - * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表集合 - */ - public List selectBizRepairOrderList(BizMaintenanceOrder bizMaintenanceOrder); - - /** - * 查询报废工单主表列表 - * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表集合 - */ - public List selectBizScrapOrderList(BizMaintenanceOrder bizMaintenanceOrder); - - -} \ No newline at end of file + public int deleteBizMaintenanceOrderByOrderIds(String[] orderIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizMaintenanceOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizMaintenanceOrderService.java index da1febac..9a17dca3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizMaintenanceOrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBizMaintenanceOrderService.java @@ -1,123 +1,63 @@ package com.ruoyi.system.service; import java.util.List; - -import com.ruoyi.common.annotation.DataScope; import com.ruoyi.system.domain.BizMaintenanceOrder; -import com.ruoyi.system.domain.BizOrderTireDetail; /** - * 维保工单主表Service接口 + * 维保工单Service接口 * - * @author yangwanli - * @date 2026-04-15 + * @author yangwl + * @date 2026-04-16 */ public interface IBizMaintenanceOrderService { /** - * 查询维保工单主表 + * 查询维保工单 * - * @param orderId 维保工单主表主键 - * @return 维保工单主表 + * @param orderId 维保工单主键 + * @return 维保工单 */ - public BizMaintenanceOrder selectBizMaintenanceOrderById(Long orderId); + public BizMaintenanceOrder selectBizMaintenanceOrderByOrderId(Long orderId); /** - * 查询维保工单主表列表 + * 查询维保工单列表 * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表集合 + * @param bizMaintenanceOrder 维保工单 + * @return 维保工单集合 */ public List selectBizMaintenanceOrderList(BizMaintenanceOrder bizMaintenanceOrder); /** - * 新增维保工单主表 + * 新增维保工单 * - * @param bizMaintenanceOrder 维保工单主表 + * @param bizMaintenanceOrder 维保工单 * @return 结果 */ public int insertBizMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder); /** - * 修改维保工单主表 + * 修改维保工单 * - * @param bizMaintenanceOrder 维保工单主表 + * @param bizMaintenanceOrder 维保工单 * @return 结果 */ public int updateBizMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder); /** - * 批量删除维保工单主表 + * 批量删除维保工单 * - * @param orderIds 需要删除的维保工单主表主键集合 + * @param orderIds 需要删除的维保工单主键集合 * @return 结果 */ - public int deleteBizMaintenanceOrderByIds(String orderIds); + public int deleteBizMaintenanceOrderByOrderIds(String orderIds); /** - * 删除维保工单主表信息 + * 删除维保工单信息 * - * @param orderId 维保工单主表主键 + * @param orderId 维保工单主键 * @return 结果 */ - public int deleteBizMaintenanceOrderById(Long orderId); + public int deleteBizMaintenanceOrderByOrderId(Long orderId); - /** - * 根据车牌号查询工单列表 - * - * @param plateNumber 车牌号 - * @return 工单列表 - */ - public List selectOrderByPlateNumber(String plateNumber); - - /** - * 根据轮胎编号查询工单 - * - * @param tireCode 轮胎编号 - * @return 工单列表 - */ - public List selectOrderByTireCode(String tireCode); - - /** - * 更新工单状态 - * - * @param orderId 工单ID - * @param status 状态 - * @return 结果 - */ - public int updateOrderStatus(Long orderId, String status); - - /** - * 查询工单数量 - * - * @param status 状态 - * @return 数量 - */ - public int selectOrderCountByStatus(String status); - - /** - * 保存工单及轮胎明细 - * - * @param bizMaintenanceOrder 工单信息 - * @param tireDetails 轮胎明细列表 - * @return 结果 - */ - public int saveOrderWithDetails(BizMaintenanceOrder bizMaintenanceOrder, List tireDetails); - - /** - * 查询修补工单主表列表 - * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表 - */ - public List selectBizRepairOrderList(BizMaintenanceOrder bizMaintenanceOrder); - - - /** - * 查询报废工单主表列表 - * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表 - */ - public List selectBizScrapOrderList(BizMaintenanceOrder bizMaintenanceOrder); -} \ No newline at end of file + List selectBizMaintenanceOrderListTwo(BizMaintenanceOrder bizMaintenanceOrder); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java index 16869415..aa0a4522 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java @@ -1,26 +1,19 @@ package com.ruoyi.system.service.impl; import java.util.List; - -import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.ShiroUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.ruoyi.system.mapper.BizMaintenanceOrderMapper; import com.ruoyi.system.domain.BizMaintenanceOrder; import com.ruoyi.system.service.IBizMaintenanceOrderService; -import com.ruoyi.system.service.IBizOrderTireDetailService; -import com.ruoyi.system.domain.BizOrderTireDetail; import com.ruoyi.common.core.text.Convert; /** - * 维保工单主表Service业务层处理 + * 维保工单Service业务层处理 * - * @author yangwanli - * @date 2026-04-15 + * @author yangwl + * @date 2026-04-16 */ @Service public class BizMaintenanceOrderServiceImpl implements IBizMaintenanceOrderService @@ -28,208 +21,82 @@ public class BizMaintenanceOrderServiceImpl implements IBizMaintenanceOrderServi @Autowired private BizMaintenanceOrderMapper bizMaintenanceOrderMapper; - @Autowired - private IBizOrderTireDetailService bizOrderTireDetailService; - /** - * 查询维保工单主表 + * 查询维保工单 * - * @param orderId 维保工单主表主键 - * @return 维保工单主表 + * @param orderId 维保工单主键 + * @return 维保工单 */ @Override - public BizMaintenanceOrder selectBizMaintenanceOrderById(Long orderId) + public BizMaintenanceOrder selectBizMaintenanceOrderByOrderId(Long orderId) { - BizMaintenanceOrder order = bizMaintenanceOrderMapper.selectBizMaintenanceOrderById(orderId); - if (order != null) { - // 查询轮胎明细 - List tireDetails = bizOrderTireDetailService.selectTireDetailByOrderId(orderId); - order.setTireDetails(tireDetails); - } - return order; + return bizMaintenanceOrderMapper.selectBizMaintenanceOrderByOrderId(orderId); } /** - * 查询维保工单主表列表 + * 查询维保工单列表 * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表 + * @param bizMaintenanceOrder 维保工单 + * @return 维保工单 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") public List selectBizMaintenanceOrderList(BizMaintenanceOrder bizMaintenanceOrder) { return bizMaintenanceOrderMapper.selectBizMaintenanceOrderList(bizMaintenanceOrder); } /** - * 新增维保工单主表 + * 新增维保工单 * - * @param bizMaintenanceOrder 维保工单主表 + * @param bizMaintenanceOrder 维保工单 * @return 结果 */ @Override public int insertBizMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder) { bizMaintenanceOrder.setCreateTime(DateUtils.getNowDate()); - bizMaintenanceOrder.setCreateBy(ShiroUtils.getLoginName()); - bizMaintenanceOrder.setOrderType("1"); // 默认设置为汽车类型 return bizMaintenanceOrderMapper.insertBizMaintenanceOrder(bizMaintenanceOrder); } /** - * 修改维保工单主表 + * 修改维保工单 * - * @param bizMaintenanceOrder 维保工单主表 + * @param bizMaintenanceOrder 维保工单 * @return 结果 */ @Override - @Transactional public int updateBizMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder) { bizMaintenanceOrder.setUpdateTime(DateUtils.getNowDate()); - bizMaintenanceOrder.setUpdateBy(ShiroUtils.getLoginName()); return bizMaintenanceOrderMapper.updateBizMaintenanceOrder(bizMaintenanceOrder); } /** - * 批量删除维保工单主表 + * 批量删除维保工单 * - * @param orderIds 需要删除的维保工单主表主键 + * @param orderIds 需要删除的维保工单主键 * @return 结果 */ @Override - @Transactional - public int deleteBizMaintenanceOrderByIds(String orderIds) + public int deleteBizMaintenanceOrderByOrderIds(String orderIds) { - String[] ids = Convert.toStrArray(orderIds); - for (String id : ids) { - Long orderId = Long.parseLong(id); - // 先删除轮胎明细 - bizOrderTireDetailService.deleteTireDetailByOrderId(orderId); - } - return bizMaintenanceOrderMapper.deleteBizMaintenanceOrderByIds(ids); + return bizMaintenanceOrderMapper.deleteBizMaintenanceOrderByOrderIds(Convert.toStrArray(orderIds)); } /** - * 删除维保工单主表信息 + * 删除维保工单信息 * - * @param orderId 维保工单主表主键 + * @param orderId 维保工单主键 * @return 结果 */ @Override - @Transactional - public int deleteBizMaintenanceOrderById(Long orderId) + public int deleteBizMaintenanceOrderByOrderId(Long orderId) { - // 先删除轮胎明细 - bizOrderTireDetailService.deleteTireDetailByOrderId(orderId); - return bizMaintenanceOrderMapper.deleteBizMaintenanceOrderById(orderId); + return bizMaintenanceOrderMapper.deleteBizMaintenanceOrderByOrderId(orderId); } - /** - * 根据车牌号查询工单列表 - * - * @param plateNumber 车牌号 - * @return 工单列表 - */ @Override - public List selectOrderByPlateNumber(String plateNumber) - { - return bizMaintenanceOrderMapper.selectOrderByPlateNumber(plateNumber); + public List selectBizMaintenanceOrderListTwo(BizMaintenanceOrder bizMaintenanceOrder) { + return bizMaintenanceOrderMapper.selectBizMaintenanceOrderListTwo(bizMaintenanceOrder); } - - /** - * 根据轮胎编号查询工单 - * - * @param tireCode 轮胎编号 - * @return 工单列表 - */ - @Override - public List selectOrderByTireCode(String tireCode) - { - return bizMaintenanceOrderMapper.selectOrderByTireCode(tireCode); - } - - /** - * 更新工单状态 - * - * @param orderId 工单ID - * @param status 状态 - * @return 结果 - */ - @Override - public int updateOrderStatus(Long orderId, String status) - { - return bizMaintenanceOrderMapper.updateOrderStatus(orderId, status); - } - - /** - * 查询工单数量 - * - * @param status 状态 - * @return 数量 - */ - @Override - public int selectOrderCountByStatus(String status) - { - return bizMaintenanceOrderMapper.selectOrderCountByStatus(status); - } - - /** - * 保存工单及轮胎明细 - * - * @param bizMaintenanceOrder 工单信息 - * @param tireDetails 轮胎明细列表 - * @return 结果 - */ - @Override - @Transactional - public int saveOrderWithDetails(BizMaintenanceOrder bizMaintenanceOrder, List tireDetails) - { - // 保存工单 - bizMaintenanceOrder.setCreateTime(DateUtils.getNowDate()); - bizMaintenanceOrder.setCreateBy(ShiroUtils.getLoginName()); - bizMaintenanceOrder.setOrderType("1"); // 默认设置为汽车类型 - - int result = bizMaintenanceOrderMapper.insertBizMaintenanceOrder(bizMaintenanceOrder); - if (result > 0 && tireDetails != null && tireDetails.size() > 0) { - // 保存轮胎明细 - for (BizOrderTireDetail detail : tireDetails) { - detail.setOrderId(bizMaintenanceOrder.getOrderId()); - detail.setCreateTime(DateUtils.getNowDate()); - detail.setCreateBy(ShiroUtils.getLoginName()); - } - bizOrderTireDetailService.batchInsertTireDetail(tireDetails); - } - return result; - } - - - /** - * 查询修补工单主表列表 - * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectBizRepairOrderList(BizMaintenanceOrder bizMaintenanceOrder) - { - return bizMaintenanceOrderMapper.selectBizRepairOrderList(bizMaintenanceOrder); - } - - - /** - * 查询报废工单主表列表 - * - * @param bizMaintenanceOrder 维保工单主表 - * @return 维保工单主表 - */ - @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectBizScrapOrderList(BizMaintenanceOrder bizMaintenanceOrder) - { - return bizMaintenanceOrderMapper.selectBizScrapOrderList(bizMaintenanceOrder); - } - -} \ No newline at end of file +} diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml index f0ad9fec..89f6b3d1 100644 --- a/ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/tyre/BizMaintenanceOrderMapper.xml @@ -22,9 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - @@ -32,89 +29,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - and o.type_code in ('1','2','4','5') - and o.order_no like concat('%', #{orderNo}, '%') - and o.plate_number like concat('%', #{plateNumber}, '%') - and o.type_code = #{typeCode} - and o.factory_id = #{factoryId} - and o.input_mileage = #{inputMileage} - and o.last_mileage = #{lastMileage} - and o.maintain_date = #{maintainDate} - and o.description like concat('%', #{description}, '%') - and o.status = #{status} - and o.order_type = #{orderType} - - and o.order_type = '1' - ${params.dataScope} + and order_no = #{orderNo} + and vehicle_id = #{vehicleId} + and plate_number = #{plateNumber} + and type_code in ('1','4') + and type_code = #{typeCode} + and factory_id = #{factoryId} + and input_mileage = #{inputMileage} + and last_mileage = #{lastMileage} + and maintain_date = #{maintainDate} + and description = #{description} + and status = #{status} + and order_type = #{orderType} - order by o.create_time desc - - - - - + + where order_id = #{orderId} - + insert into biz_maintenance_order - order_no, + order_no, vehicle_id, plate_number, - type_code, + type_code, factory_id, input_mileage, last_mileage, @@ -127,14 +88,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by, update_time, remark, - maintainer, - maintainer_date, - #{orderNo}, + #{orderNo}, #{vehicleId}, #{plateNumber}, - #{typeCode}, + #{typeCode}, #{factoryId}, #{inputMileage}, #{lastMileage}, @@ -147,18 +106,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateBy}, #{updateTime}, #{remark}, - #{maintainer}, - #{maintainerDate}, update biz_maintenance_order - order_no = #{orderNo}, + order_no = #{orderNo}, vehicle_id = #{vehicleId}, plate_number = #{plateNumber}, - type_code = #{typeCode}, + type_code = #{typeCode}, factory_id = #{factoryId}, input_mileage = #{inputMileage}, last_mileage = #{lastMileage}, @@ -166,47 +123,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" description = #{description}, status = #{status}, order_type = #{orderType}, + create_by = #{createBy}, + create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - maintainer = #{maintainer}, - maintainer_date = #{maintainerDate}, where order_id = #{orderId} - + delete from biz_maintenance_order where order_id = #{orderId} - + delete from biz_maintenance_order where order_id in #{orderId} - - - - - - - - update biz_maintenance_order - set status = #{status}, update_time = now() - where order_id = #{orderId} - \ No newline at end of file