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 1/6] =?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} + From 0ce9e4e67bcb063fdc0d098c3e06f46f72d88e12 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 23 Apr 2025 10:00:54 +0800 Subject: [PATCH 2/6] =?UTF-8?q?build(ruoyi-common):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=20Lombok=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ruoyi-common 模块的 pom.xml 文件中添加了 Lombok依赖 - Lombok 是一个 Java 库，可以通过注解减少样板代码，提高代码可读性和易维护性 --- ruoyi-common/pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index ea15dc66..76746736 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -34,6 +34,7 @@ org.apache.shiro shiro-core + @@ -94,7 +95,10 @@ javax.servlet javax.servlet-api - + + org.projectlombok + lombok + \ No newline at end of file From e0ac7764319b86652b05e6176bf7de212b4fb382 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 23 Apr 2025 10:30:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat(sip):=20=E6=B7=BB=E5=8A=A0=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 OrderDeliveryController 中新增 selectOrder 方法 - 映射到 /selectOrder 路径 - 返回 selectOrder 页面视图 --- .../com/ruoyi/sip/controller/OrderDeliveryController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderDeliveryController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderDeliveryController.java index 3fa310eb..6f0220d2 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderDeliveryController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderDeliveryController.java @@ -40,6 +40,11 @@ public class OrderDeliveryController extends BaseController { return prefix + "/delivery"; } + @GetMapping("/selectOrder") + public String selectOrder() + { + return prefix + "/selectOrder"; + } @RequiresPermissions("manage:delivery:view") @GetMapping("/import/{id}") public String importView(@PathVariable("id") Long id, ModelMap mmap) From a044272f5c9348b81afca4c0500cb600b4fde1ef Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 23 Apr 2025 11:27:34 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat(sip):=20=E6=B7=BB=E5=8A=A0=20Maintenan?= =?UTF-8?q?ceController=20=E6=8E=A7=E5=88=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 MaintenanceController 类，用于处理维护服务相关的请求 - 添加服务页面的路由映射 - 该控制器具有权限控制注解，确保只有具有相应权限的用户可以访问 --- .../sip/controller/MaintenanceController.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java new file mode 100644 index 00000000..65968259 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java @@ -0,0 +1,36 @@ +package com.ruoyi.sip.controller; + + +import com.ruoyi.sip.service.IOrderDeliveryService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @author : ch + * @version : 1.0 + * @ClassName : MaintenanceController + * @Description : + * @DATE : Created in 11:25 2025/4/23 + * 
       Copyright: Copyright(c) 2025
+ * 
       Company :   	紫光汇智信息技术有限公司
+ * Modification History: + * Date Author Version Discription + * -------------------------------------------------------------------------- + * 2025/04/23 ch 1.0 Why & What is modified: <修改原因描述> * + */ +@Controller +@RequestMapping("/manage/service") +public class MaintenanceController { + private String prefix = "manage/service"; + + + + @GetMapping() + public String service() + { + return prefix + "/service"; + } +} From 2cfe2069bc11425408dda760f8c8a4ace3d890b7 Mon Sep 17 00:00:00 2001 From: rdpnr_hemingxia Date: Wed, 23 Apr 2025 11:55:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=BB=B4=E4=BF=9D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/manage/delivery/add.html | 39 ++++++++----- .../templates/manage/delivery/edit.html | 30 +++++++--- .../templates/manage/delivery/import.html | 4 ++ .../manage/delivery/selectOrder.html | 56 +++++++++++++++++++ .../templates/manage/service/service.html | 45 +++++++++++++++ ruoyi-sip/pom.xml | 4 ++ 6 files changed, 156 insertions(+), 22 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html create mode 100644 ruoyi-admin/src/main/resources/templates/manage/service/service.html diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html index af868835..35918807 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html @@ -11,9 +11,9 @@
- + -
@@ -128,20 +128,19 @@ focusCleanup: true }); $(function (){ - getOrderList() }) -function getOrderList() { - $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){ - orderList=res.rows - $("[name='orderId']").html( - orderList.map((ele)=>{ - return `` - }).join('') - ) - - }) -} +// function getOrderList() { +// $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){ +// orderList=res.rows +// $("[name='orderId']").html( +// orderList.map((ele)=>{ +// return `` +// }).join('') +// ) +// +// }) +// } function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/add", $('#form-delivery-add').serialize()); @@ -159,6 +158,18 @@ function getOrderList() { minView: "month", autoclose: true }); + function openList(id){ + var options = { + title: "关联合同", + url: prefix + '/selectOrder', + skin: 'layui-layer-gray', + btn: false, + maxmin: false, + full: false, + index:1000 + }; + $.modal.openOptions(options) + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html index 2e85eaa4..ed4b1579 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html @@ -12,9 +12,9 @@
- + -
@@ -128,17 +128,19 @@ focusCleanup: true }); $(function (){ - getOrderList() + setTimeout( getOrderList(),500) + }) function getOrderList() { $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){ orderList=res.rows var orderId=$("[name='orderId']").attr('orderid') - $("[name='orderId']").html( - orderList.map((ele)=>{ - return `` - }).join('') - ) + orderList.forEach((ele)=>{ + if(ele.id==orderId){ + $("[name='orderName']").val(ele.orderName) + $("[name='orderId']").val(ele.id) + } + }) }) } @@ -159,6 +161,18 @@ minView: "month", autoclose: true }); + function openList(){ + var options = { + title: "关联合同", + url: prefix + '/selectOrder', + skin: 'layui-layer-gray', + btn: false, + maxmin: false, + full: false, + index:1000 + }; + $.modal.openOptions(options) + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html index ca9c0425..859335b4 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html @@ -63,6 +63,10 @@ url: prefix + "/list", field: 'productCode', title: '产品编码' }, + { + field: 'model', + title: '产品型号' + }, { field: 'serialNumber', title: '产品序列号' diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html new file mode 100644 index 00000000..2d0fa3b8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html @@ -0,0 +1,56 @@ + + + + + + +
+ +
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/manage/service/service.html b/ruoyi-admin/src/main/resources/templates/manage/service/service.html new file mode 100644 index 00000000..1f91d3fd --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/manage/service/service.html @@ -0,0 +1,45 @@ + + + + + + +
+

查询结果

+

产品信息

+ + + + + + + + + + + + + + + +
硬件序列号产品号产品描述产品线描述区域
2131340A.CZ02300002M313048.CH3C Workspace 云桌面许可证云产品CN
+
+ + + + + + + \ No newline at end of file diff --git a/ruoyi-sip/pom.xml b/ruoyi-sip/pom.xml index 09febd07..e4c44506 100644 --- a/ruoyi-sip/pom.xml +++ b/ruoyi-sip/pom.xml @@ -27,5 +27,9 @@ com.ruoyi ruoyi-common + + org.projectlombok + lombok + From a118d193a6d7304bde95a541dbf511cc196ccdf0 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 23 Apr 2025 15:09:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 IProductInfoService 和 ProductInfoMapper 中的 query 方法返回类型改为 List - 在 OrderInfoServiceImpl 和 ProductInfoServiceImpl 中添加空值判断逻辑，避免无效查询 - 使用特殊字符串 "-23232$$$$32" 作为默认序列号，以应对极端情况 --- .../main/java/com/ruoyi/sip/mapper/ProductInfoMapper.java | 2 +- .../java/com/ruoyi/sip/service/IProductInfoService.java | 2 +- .../com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java | 3 +++ .../com/ruoyi/sip/service/impl/ProductInfoServiceImpl.java | 6 +++++- 4 files changed, 10 insertions(+), 3 deletions(-) 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 63d085e7..6be1c80c 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 @@ -66,6 +66,6 @@ public interface ProductInfoMapper List listByProductCodeList(@Param("list") List productCodeList); - ProductInfo query(MaintenanceRecordsDto dto); + List query(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 c117478a..65b8a08d 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 @@ -62,5 +62,5 @@ public interface IProductInfoService */ public int deleteProductInfoById(Long id); - ProductInfo query(MaintenanceRecordsDto dto); + List 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 e2906ead..2dcb5c56 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 @@ -134,6 +134,9 @@ public class OrderInfoServiceImpl implements IOrderInfoService @Override public List selectOrderInfoByMaintenance(MaintenanceRecordsDto dto) { + if (StringUtils.isEmpty(dto.getSerialNumber()) && StringUtils.isEmpty(dto.getProductCode())){ + dto.setSerialNumber("-23232$$$$32"); + } 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 76b31c87..5bfbda85 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 @@ -2,6 +2,7 @@ package com.ruoyi.sip.service.impl; import java.util.List; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.sip.domain.MaintenanceRecordsDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -95,7 +96,10 @@ public class ProductInfoServiceImpl implements IProductInfoService } @Override - public ProductInfo query(MaintenanceRecordsDto dto) { + public List query(MaintenanceRecordsDto dto) { + if (StringUtils.isEmpty(dto.getSerialNumber()) && StringUtils.isEmpty(dto.getProductCode())){ + dto.setSerialNumber("-23232$$$$32"); + } return productInfoMapper.query(dto); } }