From 22a3ad16ff9d7046f0fc02c2230342b7dcc8bfee Mon Sep 17 00:00:00 2001 From: itcast Date: Thu, 15 Jan 2026 17:05:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AF=95=E5=AE=A1=E6=A0=B8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=96=B0=E5=A2=9E=E8=AF=95=E9=AA=8C=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/controller/RepairController.java | 4 +++- .../material/repair/domain/RepairAuditDetailsExport.java | 8 ++++++++ .../java/com/bonus/material/repair/domain/RepairTask.java | 5 +++++ .../resources/mapper/material/repair/RepairMapper.xml | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 0915522f..d7e30373 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -623,7 +623,9 @@ public class RepairController extends BaseController { repairAuditDetailsService.queryTimeCope(bean); RepairTask repairTask = new RepairTask(); repairTask.setTaskType(bean.getTaskType()); - repairTask.setTaskStatus(Integer.valueOf(bean.getTaskStatus())); + if (Objects.nonNull(bean.getTaskStatus())){ + repairTask.setTaskStatus(Integer.valueOf(bean.getTaskStatus())); + } repairTask.setStartTime(bean.getStartTime()); repairTask.setEndTime(bean.getEndTime()); repairTask.setKeyWord(bean.getKeyWord()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetailsExport.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetailsExport.java index 08555231..c8ad8ca7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetailsExport.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetailsExport.java @@ -100,6 +100,14 @@ public class RepairAuditDetailsExport { private BigDecimal scrapNum; @ApiModelProperty(value = "待维修数量") private BigDecimal beRepairedNum; + + /** + * 试验数量 + */ + @ApiModelProperty(value = "试验数量") + @Excel(name = "试验数量",sort = 7, cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) + private BigDecimal testNum; + /** * 任务创建人 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java index 7a9ab263..9790a2ee 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java @@ -102,6 +102,11 @@ public class RepairTask { @ApiModelProperty(value = "待维修数量") // @Excel(name = "待维修数量",sort = 10) private BigDecimal beRepairedNum; + + /** + * 试验数量 + */ + private BigDecimal testNum; /** * 任务创建人 */ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index f26f7ab4..74849a82 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -1837,6 +1837,7 @@ SUM(rad.repair_num) as repairNum, SUM(rad.repaired_num) as repairedNum, SUM(rad.scrap_num) as scrapNum, + CAST(ROUND(SUM(IFNULL(mt.sampling_ratio, 0) * IFNULL(rad.repaired_num, 0))/100, 3) AS DECIMAL(10, 3)) as testNum, bui.unit_name AS backUnit, bpl.pro_name AS backPro, sd.dept_name as impUnitName @@ -1887,6 +1888,7 @@ SUM(rad.repair_num) as repairNum, SUM(rad.repaired_num) as repairedNum, SUM(rad.scrap_num) as scrapNum, + CAST(ROUND(SUM(IFNULL(mt.sampling_ratio, 0) * IFNULL(rad.repaired_num, 0))/100, 3) AS DECIMAL(10, 3)) as testNum, bui.unit_name AS backUnit, bpl.pro_name AS backPro, sd.dept_name as impUnitName