bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2026-01-15 17:34:33 +08:00
parent fab03a0f3d 22a3ad16ff
commit b3f45b178b
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java
View File

@ -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());

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetailsExport.java
View File

@ -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;
/**
* 任务创建人
*/

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java
View File

@ -102,6 +102,11 @@ public class RepairTask {
@ApiModelProperty(value = "待维修数量")
// @Excel(name = "待维修数量",sort = 10)
private BigDecimal beRepairedNum;
/**
* 试验数量
*/
private BigDecimal testNum;
/**
* 任务创建人
*/

2
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml
View File

@ -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