From 11d87814ebdb8863b1a88b835d5a7d33e2c32928 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 13 五月 2024 14:55:55 +0800
Subject: [PATCH] 报告合并单元格报错解决； 检验单查询增加报告地址内容
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 4 +++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 4 +++-
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 6 ++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
index 750ee10..b9e8424 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
@@ -36,4 +37,9 @@
@ApiModelProperty("鎶ュ憡id")
private String reportId;
+ @TableField("`url`")
+ private String url;
+
+ private String urlS;
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 7e55398..b1d8c72 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -671,7 +671,9 @@
for (int a = list.size() - 1; a >= 0; a--) {
Map<String, Integer> v = maps.get(list.get(a));
for (int j = 0; j < v.get("er") - v.get("sr") + 1; j++) {
- TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+ if (v.get("ec") > v.get("sc")) {
+ TableTools.mergeCellsHorizonal(xwpfTables.get(i), v.get("sr") + j, v.get("sc"), v.get("ec"));
+ }
}
if (v.get("er") > v.get("sr")) {
TableTools.mergeCellsVertically(xwpfTables.get(i), v.get("sc"), v.get("sr"), v.get("er"));
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 33b4992..b520a2e 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -93,6 +93,8 @@
SELECT
io.*,
ir.id report_id,
+ ir.url,
+ ir.url_s,
concat(ROUND((select count(*) from ins_sample isa2
where ins_state = 5 and isa2.ins_order_id = io.id) / (select count(*) from ins_sample isa2
where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress,
@@ -102,7 +104,7 @@
FROM
ins_order io
LEFT JOIN ins_sample isa ON io.id = isa.ins_order_id
- LEFT JOIN ( SELECT id, ins_order_id, is_ratify FROM ins_report WHERE is_ratify = 1 ) ir ON io.id =
+ LEFT JOIN ( SELECT id, ins_order_id, is_ratify, url,url_s FROM ins_report WHERE is_ratify = 1 ) ir ON io.id =
ir.ins_order_id
GROUP BY
io.id
--
Gitblit v1.9.3