From 1e4fb18018ae8f023d48e1365f1e534fccc20fe9 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 13 Nov 2024 18:53:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/back/domain/MaCodeDto.java | 8 ++++++++ .../back/service/impl/BackApplyInfoServiceImpl.java | 4 ++++ .../mapper/material/back/BackApplyInfoMapper.xml | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java index 8d076054..6f0479b8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java @@ -26,6 +26,14 @@ public class MaCodeDto { @ApiModelProperty(value = "机具外观判断") private String apDetection; + private String typeId; + + private String materialName; + + private String typeName; + + private String maStatus; + /** * 附件列表 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 41a4a5eb..4345593f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -131,6 +131,10 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { maCodeDto.setMaCode(maCodeVo.getMaCode()); maCodeDto.setMaId(maCodeVo.getMaId()); maCodeDto.setApDetection(maCodeVo.getApDetection()); + maCodeDto.setTypeName(maCodeVo.getTypeName()); + maCodeDto.setMaterialName(maCodeVo.getMaterialName()); + maCodeDto.setTypeId(maCodeVo.getTypeId()); + maCodeDto.setMaStatus(maCodeVo.getMaStatus()); // 查询并设置编码附件 List bmFileInfoList = fetchBmFileInfos(details.getId(), maCodeVo.getMaId()); if (CollectionUtils.isNotEmpty(bmFileInfoList)) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 50b1d7f8..be833193 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id LEFT JOIN bm_agreement_info ba ON tta.agreement_id = ba.agreement_id WHERE - 1 = 1 + 1 = 1 and mm.ma_status = '2' and ba.unit_id = #{unitId} @@ -186,7 +186,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bcd.type_id AS typeId, mt.type_name AS materialName, mt1.type_name AS typeName, - bcd.ap_detection AS apDetection + bcd.ap_detection AS apDetection, + mm.ma_status AS maStatus FROM back_check_details bcd left join ma_machine mm on bcd.ma_id = mm.ma_id