diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java index 7a87471..ef6d9b7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -24,5 +25,7 @@ CertificatePrintDetail selectPrintDetailById(@Param("id") Long id); + List> getMeterStaffList(); + } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java index 7a87471..ef6d9b7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -24,5 +25,7 @@ CertificatePrintDetail selectPrintDetailById(@Param("id") Long id); + List> getMeterStaffList(); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index fe07844..b4b8390 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -124,4 +124,11 @@ WHERE is_del=0 )boc ON boc.id=bcp.original_record_id + + + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java index 7a87471..ef6d9b7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -24,5 +25,7 @@ CertificatePrintDetail selectPrintDetailById(@Param("id") Long id); + List> getMeterStaffList(); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index fe07844..b4b8390 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -124,4 +124,11 @@ WHERE is_del=0 )boc ON boc.id=bcp.original_record_id + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f5723a0..df28f05 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -60,9 +60,12 @@ @ExcelProperty(value = "校验类别名称",order = 7) private String measureTypeName; + @ApiModelProperty(value = "检定人员id", dataType = "String") + private String measurePersonId; + @ApiModelProperty(value = "检定人员", dataType = "String") @ExcelProperty(value = "检定人员",order = 8) - private String measurePersonId; + private String measurePersonName; @ApiModelProperty(value = "证书类型", dataType = "String") @DictCodeField(message = "证书类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS) diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java index 7a87471..ef6d9b7 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificatePrintMapper.java @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -24,5 +25,7 @@ CertificatePrintDetail selectPrintDetailById(@Param("id") Long id); + List> getMeterStaffList(); + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index fe07844..b4b8390 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -124,4 +124,11 @@ WHERE is_del=0 )boc ON boc.id=bcp.original_record_id + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java index f5723a0..df28f05 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateListResponse.java @@ -60,9 +60,12 @@ @ExcelProperty(value = "校验类别名称",order = 7) private String measureTypeName; + @ApiModelProperty(value = "检定人员id", dataType = "String") + private String measurePersonId; + @ApiModelProperty(value = "检定人员", dataType = "String") @ExcelProperty(value = "检定人员",order = 8) - private String measurePersonId; + private String measurePersonName; @ApiModelProperty(value = "证书类型", dataType = "String") @DictCodeField(message = "证书类型不合法", cacheName = MeterDictCode.CERTIFICATE_CLASS) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 436ff93..82f1066 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -181,8 +181,13 @@ } approvalList = this.baseMapper.selectBatchForApprovalList(page, request, null); } + List> staffList = this.baseMapper.getMeterStaffList(); + Map staffMap = staffList.stream().collect( + Collectors.toMap(e -> Long.valueOf(String.valueOf(e.get("id"))), e -> String.valueOf(e.get("name"))) + ); for (CertificateListResponse certificateListResponse : approvalList.getRecords()) { DictCodeUtils.convertDictCodeToName(certificateListResponse); + certificateListResponse.setMeasurePersonName(staffMap.get(certificateListResponse.getMeasurePersonId())); } return approvalList; }