From 5a1080134118db04dfc1f0fdbbcd7cdea162de8f Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 23 Apr 2025 16:38:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(ruoyi-admin):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=BB=E5=BA=93=E6=95=B0=E6=8D=AE=E6=BA=90=E9=85=8D=E7=BD=AE?= =?UTF-8?q?-=20=E8=B0=83=E6=95=B4=20MySQL=20=E8=BF=9E=E6=8E=A5=20URL?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=20-=20=E6=B7=BB=E5=8A=A0=20allowMultiQueries=20=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E6=94=AF=E6=8C=81=E5=A4=9A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application-druid.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index ba985d44..7f033ab1 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://121.199.168.157:3306/unis_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true username: root password: unis@db # 从库数据源 From 083ddd344d8aa50f18fb187765284d22d223a9b6 Mon Sep 17 00:00:00 2001 From: rdpnr_hemingxia Date: Wed, 23 Apr 2025 17:08:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/manage/service/service.html | 230 ++++++++++++++++-- 1 file changed, 210 insertions(+), 20 deletions(-) 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 1f91d3fd..e767bf82 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/service/service.html +++ b/ruoyi-admin/src/main/resources/templates/manage/service/service.html @@ -1,28 +1,165 @@ - + + -
+
+
+
单条查询
+
H3C产品保修条款
+
+

(不支持第三方信息查询)

+
+
+ + +
+
+ + +
+ + +

查询结果

-

产品信息

- - - - - - - - - - - - - - - +

产品信息

+
硬件序列号产品号产品描述产品线描述区域
2131340A.CZ02300002M313048.CH3C Workspace 云桌面许可证云产品CN
+ + + + + + + + + + +
硬件序列号产品号产品描述产品线描述区域
+
+
+ 合同 + +
+ + + + + + + + + + + + + + + + + +
服务项目识别号合同类型服务级别服务级别描述服务项服务项描述开始时间结束时间状态
+ + + + + + + + + + + + + +
@@ -32,10 +169,63 @@ getData() }); function getData() { +let serialNumber=$('#serialNumber').val() + let productCode=$('#productCode').val() - $.operate.get("/system/product/query",{isTable:0}, function (res){ - + $.operate.get(`/system/product/query?productCode=${productCode}&serialNumber=${serialNumber}`, function (res){ + let str=`暂无数据` + if(res.data.length){ + str=`` + res.data.forEach((ele)=>{ + str+=` +${ele.serialNumber} +${ele.model} +${ele.description} +${ele.productName} +${ele.model} +` + }) + } + $('#tableBOx tbody').html(str) }) + $.operate.get(`/manage/order/query?productCode=${productCode}&serialNumber=${serialNumber}`, function (res){ + let str=`暂无数据` + if(res.data.length){ + str=`` + res.data.forEach((ele)=>{ + str+=` + +${ele.orderType=='zq'?'直签合同':'代理合同'} + + + + +${ele.createdAt} + + +${ele.statua==0?'有效':'无效'} + +` + }) + } + $('#tableBOx2 tbody').html(str) + }) + } + function changeTab(show) { + if(!show){ + $('#btn1').css({'background': '#dd242a','color':'#fff'}) + $('#btn2').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'}) + + + } } From 25e060e7f5c2522912778ed3a6072c2eb3a53683 Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Wed, 23 Apr 2025 17:12:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(sip):=20=E4=BA=A7=E5=93=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=A0=E5=85=A5=E5=BA=8F=E5=88=97=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ProductInfo 类中添加 serialNumber 字段- 更新 ProductInfoMapper.xml，通过产品代码左连接 delivery_list 表 - 优化查询条件，直接使用 t2.serial_number 进行比较 --- .../com/ruoyi/sip/domain/ProductInfo.java | 99 +------------------ .../mapper/system/ProductInfoMapper.xml | 18 +++- 2 files changed, 20 insertions(+), 97 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java index e9b86544..77a1d04a 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java @@ -2,6 +2,8 @@ package com.ruoyi.sip.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.EqualsAndHashCode; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author mula * @date 2025-04-11 */ +@Data +@EqualsAndHashCode(callSuper = false) public class ProductInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -46,99 +50,6 @@ public class ProductInfo extends BaseEntity /** 删除时间 */ private Date deletedAt; + private String serialNumber; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setProductCode(String productCode) - { - this.productCode = productCode; - } - - public String getProductCode() - { - return productCode; - } - - public void setProductName(String productName) - { - this.productName = productName; - } - - public String getProductName() - { - return productName; - } - - public void setModel(String model) - { - this.model = model; - } - - public String getModel() - { - return model; - } - - public void setDescription(String description) - { - this.description = description; - } - - public String getDescription() - { - return description; - } - - public void setCreatedAt(Date createdAt) - { - this.createdAt = createdAt; - } - - public Date getCreatedAt() - { - return createdAt; - } - - public void setUpdatedAt(Date updatedAt) - { - this.updatedAt = updatedAt; - } - - public Date getUpdatedAt() - { - return updatedAt; - } - - public void setDeletedAt(Date deletedAt) - { - this.deletedAt = deletedAt; - } - - public Date getDeletedAt() - { - return deletedAt; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("productCode", getProductCode()) - .append("productName", getProductName()) - .append("model", getModel()) - .append("description", getDescription()) - .append("remark", getRemark()) - .append("createdAt", getCreatedAt()) - .append("updatedAt", getUpdatedAt()) - .append("deletedAt", getDeletedAt()) - .toString(); - } } diff --git a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml index 9bb15e4c..d248a4e0 100644 --- a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml @@ -43,13 +43,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"