From 300a842c6acfef9d508d829177a65fb1d63722f6 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 23 Apr 2025 09:58:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E6=B7=BB=E5=8A=A0=E7=BB=B4?= =?UTF-8?q?=E4=BF=9D=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 OrderInfo 和 ProductInfo 模块中添加维保记录查询接口和实现 - 新增 MaintenanceRecordsDto 类用于维保记录查询参数 - 在 DeliveryList 中添加 model 字段 - 更新相关 Mapper 和 XML 文件以支持维保记录查询 --- .../sip/controller/OrderInfoController.java | 15 +++++++---- .../sip/controller/ProductInfoController.java | 15 +++++++++++ .../com/ruoyi/sip/domain/DeliveryList.java | 10 ++++++++ .../sip/domain/MaintenanceRecordsDto.java | 25 +++++++++++++++++++ .../com/ruoyi/sip/mapper/OrderInfoMapper.java | 4 +++ .../ruoyi/sip/mapper/ProductInfoMapper.java | 5 ++++ .../ruoyi/sip/service/IOrderInfoService.java | 4 +++ .../sip/service/IProductInfoService.java | 5 ++++ .../service/impl/OrderInfoServiceImpl.java | 8 ++++++ .../service/impl/ProductInfoServiceImpl.java | 7 ++++++ .../mapper/manage/DeliveryListMapper.xml | 2 +- .../mapper/manage/OrderInfoMapper.xml | 14 +++++++++++ .../mapper/system/ProductInfoMapper.xml | 11 ++++++++ 13 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecordsDto.java diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java index 21f91cb5..cf546a75 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java @@ -2,16 +2,13 @@ package com.ruoyi.sip.controller; import java.util.List; +import com.ruoyi.sip.domain.MaintenanceRecordsDto; import com.ruoyi.sip.domain.OrderList; 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.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.sip.domain.OrderInfo; @@ -127,4 +124,12 @@ public class OrderInfoController extends BaseController { return toAjax(orderInfoService.deleteOrderInfoByIds(ids)); } + + @Log(title = "合同档案", businessType = BusinessType.DELETE) + @GetMapping( "/query") + @ResponseBody + public AjaxResult query(MaintenanceRecordsDto dto) + { + return AjaxResult.success(orderInfoService.selectOrderInfoByMaintenance(dto)); + } } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProductInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProductInfoController.java index b5e6d43e..ccef330d 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProductInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/ProductInfoController.java @@ -1,6 +1,8 @@ package com.ruoyi.sip.controller; import java.util.List; + +import com.ruoyi.sip.domain.MaintenanceRecordsDto; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -125,4 +127,17 @@ public class ProductInfoController extends BaseController { return toAjax(productInfoService.deleteProductInfoByIds(ids)); } + + + /** + * 根据序列号查询产品信息 + */ + + + @GetMapping( "/query") + @ResponseBody + public AjaxResult query(MaintenanceRecordsDto dto) + { + return AjaxResult.success(productInfoService.query(dto)); + } } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java index 67e00e5e..e626ad5a 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java @@ -38,6 +38,7 @@ public class DeliveryList extends BaseEntity @Excel(name = "备注") private String remark; + private String model; /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") // @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -141,11 +142,20 @@ public class DeliveryList extends BaseEntity return deletedAt; } + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + @Override public String toString() { return new StringJoiner(", ", DeliveryList.class.getSimpleName() + "[", "]") .add("id=" + id) .add("deliveryId=" + deliveryId) + .add("model=" + model) .add("orderCode='" + orderCode + "'") .add("productCode='" + productCode + "'") .add("serialNumber='" + serialNumber + "'") diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecordsDto.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecordsDto.java new file mode 100644 index 00000000..a5b5eb9e --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecordsDto.java @@ -0,0 +1,25 @@ +package com.ruoyi.sip.domain; + + +import lombok.Data; + +/** + * @author : ch + * @version : 1.0 + * @ClassName : MaintenanceRecordsDto + * @Description : + * @DATE : Created in 17:50 2025/4/22 + * 
       Copyright: Copyright(c) 2025
+ * 
       Company :   	紫光汇智信息技术有限公司
+ * Modification History: + * Date Author Version Discription + * -------------------------------------------------------------------------- + * 2025/04/22 ch 1.0 Why & What is modified: <修改原因描述> * + */ +@Data +public class MaintenanceRecordsDto { + //序列号 + private String serialNumber; + private String productCode; + +} diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java index 7647004e..2405a86b 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderInfoMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.sip.mapper; import java.util.List; + +import com.ruoyi.sip.domain.MaintenanceRecordsDto; import com.ruoyi.sip.domain.OrderInfo; import com.ruoyi.sip.domain.OrderList; @@ -99,4 +101,6 @@ public interface OrderInfoMapper void updateListBatch(List orderListList); List listOrderListByDeliveryId(Long deliveryId); + + List selectOrderInfoByMaintenance(MaintenanceRecordsDto dto); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java index 661908dc..63d085e7 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.sip.mapper; import java.util.List; + +import com.ruoyi.sip.domain.MaintenanceRecordsDto; import com.ruoyi.sip.domain.ProductInfo; import org.apache.ibatis.annotations.Param; @@ -63,4 +65,7 @@ public interface ProductInfoMapper List listByProductCodeList(@Param("list") List productCodeList); + + ProductInfo query(MaintenanceRecordsDto dto); + } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java index e2f71c43..1a22a75d 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOrderInfoService.java @@ -1,6 +1,8 @@ package com.ruoyi.sip.service; import java.util.List; + +import com.ruoyi.sip.domain.MaintenanceRecordsDto; import com.ruoyi.sip.domain.OrderInfo; import com.ruoyi.sip.domain.OrderList; @@ -59,4 +61,6 @@ public interface IOrderInfoService * @return 结果 */ public int deleteOrderInfoById(Long id); + + List selectOrderInfoByMaintenance(MaintenanceRecordsDto dto); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java index 94647976..c117478a 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProductInfoService.java @@ -1,6 +1,9 @@ package com.ruoyi.sip.service; import java.util.List; + +import com.ruoyi.sip.controller.ProductInfoController; +import com.ruoyi.sip.domain.MaintenanceRecordsDto; import com.ruoyi.sip.domain.ProductInfo; /** @@ -58,4 +61,6 @@ public interface IProductInfoService * @return 结果 */ public int deleteProductInfoById(Long id); + + ProductInfo query(MaintenanceRecordsDto dto); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java index 1254649b..e2906ead 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.sip.service.impl; +import java.util.Collections; import java.util.List; + +import com.ruoyi.sip.domain.MaintenanceRecordsDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -129,6 +132,11 @@ public class OrderInfoServiceImpl implements IOrderInfoService return orderInfoMapper.deleteOrderInfoById(id); } + @Override + public List selectOrderInfoByMaintenance(MaintenanceRecordsDto dto) { + return orderInfoMapper.selectOrderInfoByMaintenance(dto); + } + /** * 新增合同清单信息 * diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java index 1b666037..76b31c87 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.sip.service.impl; import java.util.List; + +import com.ruoyi.sip.domain.MaintenanceRecordsDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.sip.mapper.ProductInfoMapper; @@ -91,4 +93,9 @@ public class ProductInfoServiceImpl implements IProductInfoService { return productInfoMapper.deleteProductInfoById(id); } + + @Override + public ProductInfo query(MaintenanceRecordsDto dto) { + return productInfoMapper.query(dto); + } } diff --git a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml index 80859cfe..fbd0a049 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t1.id, t1.delivery_id,t1.product_code, t1.serial_number, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at, t2.delivery_code, - t3.product_code, t3.product_name, + t3.product_code, t3.product_name,t3.model, t4.order_code from delivery_list t1 left join order_delivery t2 on t1.delivery_id = t2.id diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 5bdf0416..bce1a3ce 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -134,6 +134,20 @@ where order_id = (select order_id from order_delivery where id = #{deliveryId} and status=0) and status=0 + insert into order_info diff --git a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml index 30c85aab..9bb15e4c 100644 --- a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml @@ -42,6 +42,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} +