From 667e095173f1af0fbdf79756ecbbd7b6da913861 Mon Sep 17 00:00:00 2001
From: "mula.liu" <mula.liu@163.com>
Date: Thu, 24 Apr 2025 16:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/manage/delivery/add.html        |  5 +-
 .../templates/manage/delivery/delivery.html   | 16 ++--
 .../templates/manage/delivery/edit.html       |  1 -
 .../manage/delivery/selectOrder.html          | 14 ----
 .../templates/manage/order/edit.html          |  2 -
 .../templates/manage/service/service.html     | 82 ++++++++-----------
 .../sip/controller/MaintenanceController.java |  2 +
 .../ruoyi/sip/domain/MaintenanceRecord.java   |  3 +-
 .../com/ruoyi/sip/mapper/OrderInfoMapper.java |  2 +-
 .../service/impl/DeliveryListServiceImpl.java |  2 +-
 .../mapper/manage/MaintenanceMapper.xml       |  5 +-
 11 files changed, 55 insertions(+), 79 deletions(-)

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 be4b574a..2507c8c0 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
@@ -165,7 +165,10 @@
                 title: "关联合同",
                 url: prefix + '/selectOrder',
                 skin: 'layui-layer-gray',
-                btn: false,
+                btn: ['关闭'],
+                yes:function(index){
+                    $.modal.close(index)
+                },
                 maxmin: false,
                 full: false,
                 index:1000
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
index 6a34a025..8fa17e78 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
@@ -90,17 +90,13 @@
                     visible: false
                 },
                 {
-                    field: 'orderId',
-                    title: '关联合同id'
+                    field: 'orderCode',
+                    title: '关联合同编号'
+                },
+                {
+                    field: 'orderName',
+                    title: '关联合同名称'
                 },
-                    {
-                        field: 'orderCode',
-                        title: '关联合同编号'
-                    },
-                    {
-                        field: 'orderName',
-                        title: '关联合同名称'
-                    },
                 {
                     field: 'deliveryCode',
                     title: '发货单号'
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 1536d359..b157e6b1 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
@@ -168,7 +168,6 @@
                 title: "关联合同",
                 url: prefix + '/selectOrder',
                 skin: 'layui-layer-gray',
-                btn: true,
                 btn: ['关闭'],
                 yes:function(index){
                     $.modal.close(index)
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
index 99e89a76..f8de6709 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
@@ -17,17 +17,6 @@
           <label>合同名称：</label>
           <input type="text" name="orderName"/>
         </li>
-        <li>
-          <label>客户名称：</label>
-          <input type="text" name="customerName"/>
-        </li>
-        <li>
-          <label>合同类型：</label>
-          <select name="orderType" th:with="type=${@dict.getType('order_type')}">
-            <option value="">所有</option>
-            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-          </select>
-        </li>
         <li>
           <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
           <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -39,9 +28,6 @@
 </div>
   <table id="bootstrap-table"></table>
 </div>
-  <div class="col-sm-12 select-table table-striped"  >
-    <table id="bootstrap-table"></table>
-  </div>
 
 <th:block th:include="include :: footer" />
 
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index 43b9b806..69ddaf39 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -211,8 +211,6 @@
                     align: 'center',
                     title: "序号",
                     formatter: function (value, row, index) {
-                    	// var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
-                        var html = $.common.sprintf("<input type='hidden' name='orderListList[%s].id' value='%s'>", index, value);
                     	return $.table.serialNumber(index);
                     }
                 },
diff --git a/ruoyi-admin/src/main/resources/templates/manage/service/service.html b/ruoyi-admin/src/main/resources/templates/manage/service/service.html
index 7c8b890c..799ba250 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/service/service.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/service/service.html
@@ -95,18 +95,14 @@
 <body  class="gray-bg">
 <div class="col-sm-12 select-table table-striped" >
     <div class="topBox">
-        <div class="title">单条查询 <span>(不支持第三方信息查询)</span></div>
+        <div class="title">产品维保查询 <span>(不支持第三方信息查询)</span></div>
 <!--    <div style="color: #dd242a">H3C产品保修条款</div>-->
     </div>
     <div class="container">
         <div class="form-group">
             <label for="serialNumber">序列号</label>
-            <input type="text" id="serialNumber" placeholder="请输入序列号">
+            <input type="text" id="serialNumber" placeholder="请输入产品序列号">
         </div>
-<!--        <div class="form-group">-->
-<!--            <label for="productCode">产品号</label>-->
-<!--            <input type="text" id="productCode" placeholder="请输入产品号">-->
-<!--        </div>-->
         <button type="button" onclick="getData()">查询</button>
 
     </div>
@@ -115,10 +111,10 @@
     <table class="tableBOx" id="tableBOx">
       <thead>
       <tr>
-          <th>硬件序列号</th>
-          <th>产品号</th>
+          <th>序列号</th>
+          <th>产品编码</th>
           <th>产品描述</th>
-          <th>产品线描述</th>
+          <th>产品名称</th>
           <th>区域</th>
       </tr>
       </thead>
@@ -127,13 +123,13 @@
     </table>
     <div >
         <div style="margin: 20px 0;">
-        <span  id="btn1" class="tabBtn"  onclick="changeTab(0)" style="background: #dd242a;color: #fff">合同</span>
-        <span id="btn2" class="tabBtn" onclick="changeTab(1)">标准保修</span>
+        <span id="tab1" class="tabBtn"  onclick="changeTab(0)" style="background: #dd242a;color: #fff">相关合同</span>
+        <span id="tab2" class="tabBtn" onclick="changeTab(1)">标准保修</span>
         </div>
         <table class="tableBOx" id="tableBOx2">
             <thead>
             <tr>
-                <th>服务项目识别号</th>
+                <th>合同识别号</th>
                 <th>合同类型</th>
                 <th>服务级别</th>
                 <th>服务级别描述</th>
@@ -142,7 +138,6 @@
                 <th>开始时间</th>
                 <th>结束时间</th>
                 <th>状态</th>
-
             </tr>
             </thead>
             <tbody>
@@ -168,8 +163,9 @@
 
 <script>
     $(function() {
-        getData()
+        //getData()
     });
+
     function getData() {
 let serialNumber=$('#serialNumber').val()
         $.operate.get(`/manage/service/product?serialNumber=${serialNumber}`, function (res){
@@ -178,12 +174,12 @@ let serialNumber=$('#serialNumber').val()
                  str=``
                 res.data.forEach((ele)=>{
                     str+=`<tr>
-<td>${ele.serialNumber}</td>
-<td>${ele.model}</td>
-<td>${ele.description}</td>
-<td>${ele.productName}</td>
-<td>${ele.model}</td>
-</tr>`
+                        <td>${ele.serialNumber}</td>
+                        <td>${ele.model}</td>
+                        <td>${ele.description}</td>
+                        <td>${ele.productName}</td>
+                        <td>CN</td>
+                        </tr>`
                 })
             }
             $('#tableBOx tbody').html(str)
@@ -194,18 +190,16 @@ let serialNumber=$('#serialNumber').val()
                 str=``
                 res.data.forEach((ele)=>{
                     str+=`<tr>
-<td></td>
-<td>${ele.orderType == 'zq' ? '直签合同' : '代理合同'}</td>
-<td></td>
-<td></td>
-<td></td>
-<td></td>
-<td>${ele.createdAt}</td>
-<td></td>
-
-<td>${ele.statua == 0 ? '有效' : '无效'}</td>
-
-</tr>`
+                            <td>${ele.orderCode}</td>
+                            <td>${ele.orderType == 'zq' ? '直签合同' : '代理合同'}</td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td>${ele.createdAt}</td>
+                            <td></td>
+                            <td>${ele.status == 0 ? '有效' : '无效'}</td>
+                           </tr>`
                 })
             }
             $('#tableBOx2 tbody').html(str)
@@ -216,15 +210,12 @@ let serialNumber=$('#serialNumber').val()
                 str=``
                 res.data.forEach((ele)=>{
                     str+=`<tr>
-<td></td>
-<td></td>
-<td>${ele.startDate}</td>
-<td></td>
-<td></td>
-
-<td>${ele.statua == 0 ? '有效' : '无效'}</td>
-
-</tr>`
+                            <td></td>
+                            <td></td>
+                            <td>${ele.startDate}</td>
+                            <td>${ele.endDate}</td>
+                            <td>${ele.status == 0 ? '有效' : '无效'}</td>
+                           </tr>`
                 })
             }
             $('#tableBOx3 tbody').html(str)
@@ -232,17 +223,16 @@ let serialNumber=$('#serialNumber').val()
     }
     function changeTab(show) {
         if(!show){
-        $('#btn1').css({'background': '#dd242a','color':'#fff'})
-            $('#btn2').css({'background': '#fff','color':'#333'})
+        $('#tab1').css({'background': '#dd242a','color':'#fff'})
+            $('#tab2').css({'background': '#fff','color':'#333'})
 
             $('#tableBOx2').show()
             $('#tableBOx3').hide()
         }else{
             $('#tableBOx3').show()
             $('#tableBOx2').hide()
-            $('#btn2').css({'background': '#dd242a','color':'#fff'})
-            $('#btn1').css({'background': '#fff','color':'#333'})
-
+            $('#tab2').css({'background': '#dd242a','color':'#fff'})
+            $('#tab1').css({'background': '#fff','color':'#333'})
 
         }
     }
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
index 5d99107e..485de255 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java
@@ -56,6 +56,7 @@ public class MaintenanceController {
     {
         return AjaxResult.success(service.query(dto));
     }
+
     @GetMapping("/product")
     @ResponseBody
     @Anonymous
@@ -63,6 +64,7 @@ public class MaintenanceController {
     {
         return AjaxResult.success(productInfoService.query(dto));
     }
+
     @GetMapping("/order")
     @ResponseBody
     @Anonymous
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java
index ca6c49b5..0ec5bc15 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java
@@ -22,6 +22,7 @@ import java.util.Date;
 public class MaintenanceRecord {
     //开始时间
     private Date startDate;
-
+    private Date endDate;
+    private Long status;
 
 }
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 2405a86b..ad29f9db 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
@@ -89,7 +89,7 @@ public interface OrderInfoMapper
 
     /**
      * 删除合同清单
-     * @param id
+     * @param orderListList
      * @return
      */
     int logicRemoveListById(List<OrderList> orderListList);
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
index 90c18b42..9a82045f 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
@@ -120,7 +120,7 @@ public class DeliveryListServiceImpl implements IDeliveryListService {
         List<String> existsProductCodeList = orderLists.stream().map(OrderList::getProductCode).collect(Collectors.toList());
         List<String> notExistsProductCodeList = productCodeList.stream().filter(productCode -> !existsProductCodeList.contains(productCode)).collect(Collectors.toList());
         if (!notExistsProductCodeList.isEmpty()) {
-           return AjaxResult.error(StringUtils.format("产品编码为[{}]的产品在发货单中未找到,请确认后重试;", String.join(",", notExistsProductCodeList)));
+           return AjaxResult.error(StringUtils.format("编码为[{}]的产品在合同请单中未找到,请确认后重试;", String.join(",", notExistsProductCodeList)));
         }
 
         for (DeliveryList list : deliveryList) {
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml
index d7c5de73..2010ad0a 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml
@@ -7,10 +7,11 @@
     <resultMap type="MaintenanceRecord" id="MaintenanceRecordResult">
 
         <result property="startDate" column="start_date"/>
-
+        <result property="endDate" column="end_date"/>
+        <result property="status" column="status"/>
     </resultMap>
     <select id="query" resultMap="MaintenanceRecordResult">
-        select delivery_date as start_date from order_delivery
+        select delivery_date as start_date, DATE_ADD(delivery_date, INTERVAL 3 YEAR) end_date, status from order_delivery
         where id in (select delivery_id from delivery_list where serial_number=#{serialNumber})
     </select>