From d17284eef8c6712eb759d25bedd5b2c79bc9c515 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 22 Jan 2026 13:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/ma/controller/MachineController.java | 12 ++++++++++++ .../repair/controller/RepairController.java | 8 +++++++- .../repair/domain/RepairAuditDetailsExport.java | 2 +- .../bonus/material/repair/domain/RepairTask.java | 3 +++ .../repair/service/impl/RepairServiceImpl.java | 15 ++++++++++++++- .../material/lease/LeaseApplyDetailsMapper.xml | 2 +- .../mapper/material/repair/RepairMapper.xml | 4 +++- 7 files changed, 41 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java index 02d273f5..7468ca84 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java @@ -92,6 +92,18 @@ public class MachineController extends BaseController { return machineService.selectByTypeList(type); } + /** + * todo 材料站获取机具设备管理列表专用（未加组织机构条件筛选） + * @param type + * @return + */ + @ApiOperation(value = "查询机具设备管理列表2") + //@RequiresPermissions("ma:machine:typeList") + @GetMapping("/getMaterialTypeList") + public AjaxResult getMaterialTypeList(Type type) { + return machineService.selectByTypeList(type); + } + /** * 导出机具设备管理列表 */ 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 d7e30373..e312099e 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 @@ -616,6 +616,10 @@ public class RepairController extends BaseController { if (Objects.isNull(bean)) { bean = new RepairAuditDetails(); } + String fileName = "修试审核明细"; + if (bean.getStartTime() != null && bean.getEndTime() != null) { + fileName = "修试审核明细"+ "（时间" + bean.getStartTime() + "至" + bean.getEndTime()+ "）"; + } if (Objects.isNull(bean.getTaskType())) { bean.setTaskType(TM_TASK_REPAIR_AUDIT.getTaskTypeId()); } @@ -639,6 +643,8 @@ public class RepairController extends BaseController { ExcelUtil util = new ExcelUtil<>(RepairAuditDetailsExport.class); - util.exportExcel(response, listExport, "入库单", "入库单"); + // 获取当前年月日时分秒导出时间，用括号拼接在后面 + String title = "修试审核明细" + "（" + "导出时间：" + DateUtils.getTime() + "）"; + util.exportExcel(response, listExport, fileName, title); } } 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 c8ad8ca7..663c1da6 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 @@ -42,7 +42,7 @@ public class RepairAuditDetailsExport { private Long parentId; @ApiModelProperty(value = "序号") - @Excel(name = "序号", isSequence = true, sort = 0) + @Excel(name = "序号", isSequence = true, sort = 0, width = 5) private String serialNumber; /** 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 2361163c..dc4d3ce9 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 @@ -256,4 +256,7 @@ public class RepairTask { @ApiModelProperty(value = "规格id") private String typeModelId; + + @ApiModelProperty(value = "设备编码code集合") + private String maCode; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 2e619eee..b3bf403b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -160,12 +160,25 @@ public class RepairServiceImpl implements RepairService { * @return */ private boolean containsKeyword(RepairTask item, String keyWord) { + // 1. 处理maCode的分段匹配 + boolean maCodeMatch = false; + if (item.getMaCode() != null && !keyWord.isEmpty()) { + String[] maCodeParts = item.getMaCode().split(","); + for (String part : maCodeParts) { + String trimedPart = part.trim(); + if (trimedPart.contains(keyWord)) { + maCodeMatch = true; + break; + } + } + } return (item.getType() != null && item.getType().contains(keyWord)) || (item.getRepairCode() != null && item.getRepairCode().contains(keyWord)) || (item.getBackUnit() != null && item.getBackUnit().contains(keyWord)) || (item.getBackPro() != null && item.getBackPro().contains(keyWord)) || (item.getBackCode() != null && item.getBackCode().contains(keyWord)) || - (item.getCreateName() != null && item.getCreateName().contains(keyWord)); + (item.getCreateName() != null && item.getCreateName().contains(keyWord)) || + maCodeMatch; } @Override diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml index d8198635..df30ca02 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml @@ -854,7 +854,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" JOIN ma_type_keeper mtk ON mtk.type_id = lod.type_id AND mtk.user_id =#{userId} where - tt.task_type = '2' + tt.task_type = '2' and lai.direct_id is null and COALESCE(lai.release_time, lai.create_time) BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') 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 8f8b05de..dfc371a4 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 @@ -299,11 +299,13 @@ WHEN tt.task_status in (1, 2) THEN tt.update_time ELSE NULL - END AS submitTime + END AS submitTime, + GROUP_CONCAT(mm.ma_code) AS maCode FROM repair_apply_details rd LEFT JOIN ma_type mt on rd.type_id = mt.type_id LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id + LEFT JOIN ma_machine mm ON mm.ma_id = rd.ma_id LEFT JOIN tm_task tt on rd.task_id = tt.task_id LEFT JOIN back_apply_info bai ON rd.back_id = bai.id LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id