diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index 9cbeac6..b44f38a 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -8,10 +8,12 @@ import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +37,8 @@ Long selectMaxCode(String prefix); BusinessCertificateReport detailById( @Param("id") Long id); + @MapKey("id") + List> approvalSignName(); @Select("SELECT count(id) from business_certificate_report where approval_status =4 and certificate_report_code = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(Long sampleId,Long orderId); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index 9cbeac6..b44f38a 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -8,10 +8,12 @@ import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +37,8 @@ Long selectMaxCode(String prefix); BusinessCertificateReport detailById( @Param("id") Long id); + @MapKey("id") + List> approvalSignName(); @Select("SELECT count(id) from business_certificate_report where approval_status =4 and certificate_report_code = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(Long sampleId,Long orderId); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 3aa3520..694e5e6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -244,13 +244,17 @@ + + + diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index 9cbeac6..b44f38a 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -8,10 +8,12 @@ import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +37,8 @@ Long selectMaxCode(String prefix); BusinessCertificateReport detailById( @Param("id") Long id); + @MapKey("id") + List> approvalSignName(); @Select("SELECT count(id) from business_certificate_report where approval_status =4 and certificate_report_code = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(Long sampleId,Long orderId); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 3aa3520..694e5e6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -244,13 +244,17 @@ + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index a8a331c..58ca71e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -124,9 +124,9 @@ /** * 认可标志专用章id(签章表id) */ - @TableField("approval_sign_id") + @TableField("approval_sign_ids") @ApiModelProperty(value = "认可标志专用章ids", dataType = "Long") - private String approvalSignId; + private String approvalSignIds; /** * 证书报告附件(minio存储文件名) diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index 9cbeac6..b44f38a 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -8,10 +8,12 @@ import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +37,8 @@ Long selectMaxCode(String prefix); BusinessCertificateReport detailById( @Param("id") Long id); + @MapKey("id") + List> approvalSignName(); @Select("SELECT count(id) from business_certificate_report where approval_status =4 and certificate_report_code = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(Long sampleId,Long orderId); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 3aa3520..694e5e6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -244,13 +244,17 @@ + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index a8a331c..58ca71e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -124,9 +124,9 @@ /** * 认可标志专用章id(签章表id) */ - @TableField("approval_sign_id") + @TableField("approval_sign_ids") @ApiModelProperty(value = "认可标志专用章ids", dataType = "Long") - private String approvalSignId; + private String approvalSignIds; /** * 证书报告附件(minio存储文件名) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index ed19375..ecc8618 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -150,13 +150,14 @@ public BusinessCertificateReport certificateReportDetail(Long id) { // BusinessCertificateReport certificateReport = this.baseMapper.selectById(id); BusinessCertificateReport certificateReport = this.baseMapper.detailById(id); + getApprovalSignName(certificateReport); if (certificateReport.getOriginalRecordId() != null) { try { certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if(Objects.isNull(certificateReport.getBusinessOriginalRecord())){ + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType())); + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); } catch (Exception e) { e.printStackTrace(); } @@ -174,7 +175,7 @@ @Transactional public ReturnDTO submitCertificateReport(BaseApprovalSubmitRequest request) { //已取消后的提交需先删除原有实例 - if (StringUtils.isNotEmpty(request.getProcessId())){ + if (StringUtils.isNotEmpty(request.getProcessId())) { runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED); runtimeService.deleteProcessInstance(request.getProcessId(), "删除"); } @@ -282,7 +283,6 @@ } - /** * 客户、样品详情列表 */ @@ -420,6 +420,25 @@ return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList()); } + /** + * 设置多项认可章的属性 + */ + private void getApprovalSignName(BusinessCertificateReport certificateReport) { + if (StringUtils.isNotEmpty(certificateReport.getApprovalSignIds())) { + List> approvalSignNameList = this.baseMapper.approvalSignName(); + Map approvalSignNameMap = approvalSignNameList.stream().collect(Collectors.toMap( + e -> Long.valueOf(String.valueOf(e.get("id"))), e -> String.valueOf(e.get("signName")) + )); + String approvalSignNames = ""; + String[] approvalSignIds = certificateReport.getApprovalSignIds().split(","); + for (String approvalSignId : approvalSignIds) { + approvalSignNames += approvalSignNameMap.get(Long.valueOf(approvalSignId))+ ","; + } + approvalSignNames = approvalSignNames.substring(0, approvalSignNames.length() - 1); + certificateReport.setApprovalSignName(approvalSignNames); + } + } + private List handleApprovalListResponse(List approvalList, String status) { approvalList.stream().forEach(result -> { //审批状态两种获取方式:1、在此处设置,2、在flowable中设置业务状态,暂采取1 @@ -439,7 +458,7 @@ AuthUser authUser = ShiroKit.getUser(); certificateReport.setCreateUser(authUser.getId()); MeterStaff meterStaff = getMeterStaffInfo(authUser); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); certificateReport.setMeasurePersonId(meterStaff.getId()); certificateReport.setMeasureDeptId(authUser.getDeptId()); certificateReport.setCertificateReportCode(certificateReportNo); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index 9cbeac6..b44f38a 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -8,10 +8,12 @@ import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +37,8 @@ Long selectMaxCode(String prefix); BusinessCertificateReport detailById( @Param("id") Long id); + @MapKey("id") + List> approvalSignName(); @Select("SELECT count(id) from business_certificate_report where approval_status =4 and certificate_report_code = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(Long sampleId,Long orderId); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 3aa3520..694e5e6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -244,13 +244,17 @@ + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index a8a331c..58ca71e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -124,9 +124,9 @@ /** * 认可标志专用章id(签章表id) */ - @TableField("approval_sign_id") + @TableField("approval_sign_ids") @ApiModelProperty(value = "认可标志专用章ids", dataType = "Long") - private String approvalSignId; + private String approvalSignIds; /** * 证书报告附件(minio存储文件名) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index ed19375..ecc8618 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -150,13 +150,14 @@ public BusinessCertificateReport certificateReportDetail(Long id) { // BusinessCertificateReport certificateReport = this.baseMapper.selectById(id); BusinessCertificateReport certificateReport = this.baseMapper.detailById(id); + getApprovalSignName(certificateReport); if (certificateReport.getOriginalRecordId() != null) { try { certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if(Objects.isNull(certificateReport.getBusinessOriginalRecord())){ + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType())); + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); } catch (Exception e) { e.printStackTrace(); } @@ -174,7 +175,7 @@ @Transactional public ReturnDTO submitCertificateReport(BaseApprovalSubmitRequest request) { //已取消后的提交需先删除原有实例 - if (StringUtils.isNotEmpty(request.getProcessId())){ + if (StringUtils.isNotEmpty(request.getProcessId())) { runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED); runtimeService.deleteProcessInstance(request.getProcessId(), "删除"); } @@ -282,7 +283,6 @@ } - /** * 客户、样品详情列表 */ @@ -420,6 +420,25 @@ return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList()); } + /** + * 设置多项认可章的属性 + */ + private void getApprovalSignName(BusinessCertificateReport certificateReport) { + if (StringUtils.isNotEmpty(certificateReport.getApprovalSignIds())) { + List> approvalSignNameList = this.baseMapper.approvalSignName(); + Map approvalSignNameMap = approvalSignNameList.stream().collect(Collectors.toMap( + e -> Long.valueOf(String.valueOf(e.get("id"))), e -> String.valueOf(e.get("signName")) + )); + String approvalSignNames = ""; + String[] approvalSignIds = certificateReport.getApprovalSignIds().split(","); + for (String approvalSignId : approvalSignIds) { + approvalSignNames += approvalSignNameMap.get(Long.valueOf(approvalSignId))+ ","; + } + approvalSignNames = approvalSignNames.substring(0, approvalSignNames.length() - 1); + certificateReport.setApprovalSignName(approvalSignNames); + } + } + private List handleApprovalListResponse(List approvalList, String status) { approvalList.stream().forEach(result -> { //审批状态两种获取方式:1、在此处设置,2、在flowable中设置业务状态,暂采取1 @@ -439,7 +458,7 @@ AuthUser authUser = ShiroKit.getUser(); certificateReport.setCreateUser(authUser.getId()); MeterStaff meterStaff = getMeterStaffInfo(authUser); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); certificateReport.setMeasurePersonId(meterStaff.getId()); certificateReport.setMeasureDeptId(authUser.getDeptId()); certificateReport.setCertificateReportCode(certificateReportNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 4f849b4..e12bad0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -113,7 +113,7 @@ if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(8, 1, 30000, + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); executor.execute(() -> { deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index 9cbeac6..b44f38a 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -8,10 +8,12 @@ import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +37,8 @@ Long selectMaxCode(String prefix); BusinessCertificateReport detailById( @Param("id") Long id); + @MapKey("id") + List> approvalSignName(); @Select("SELECT count(id) from business_certificate_report where approval_status =4 and certificate_report_code = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(Long sampleId,Long orderId); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 3aa3520..694e5e6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -244,13 +244,17 @@ + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index a8a331c..58ca71e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -124,9 +124,9 @@ /** * 认可标志专用章id(签章表id) */ - @TableField("approval_sign_id") + @TableField("approval_sign_ids") @ApiModelProperty(value = "认可标志专用章ids", dataType = "Long") - private String approvalSignId; + private String approvalSignIds; /** * 证书报告附件(minio存储文件名) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index ed19375..ecc8618 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -150,13 +150,14 @@ public BusinessCertificateReport certificateReportDetail(Long id) { // BusinessCertificateReport certificateReport = this.baseMapper.selectById(id); BusinessCertificateReport certificateReport = this.baseMapper.detailById(id); + getApprovalSignName(certificateReport); if (certificateReport.getOriginalRecordId() != null) { try { certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if(Objects.isNull(certificateReport.getBusinessOriginalRecord())){ + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType())); + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); } catch (Exception e) { e.printStackTrace(); } @@ -174,7 +175,7 @@ @Transactional public ReturnDTO submitCertificateReport(BaseApprovalSubmitRequest request) { //已取消后的提交需先删除原有实例 - if (StringUtils.isNotEmpty(request.getProcessId())){ + if (StringUtils.isNotEmpty(request.getProcessId())) { runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED); runtimeService.deleteProcessInstance(request.getProcessId(), "删除"); } @@ -282,7 +283,6 @@ } - /** * 客户、样品详情列表 */ @@ -420,6 +420,25 @@ return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList()); } + /** + * 设置多项认可章的属性 + */ + private void getApprovalSignName(BusinessCertificateReport certificateReport) { + if (StringUtils.isNotEmpty(certificateReport.getApprovalSignIds())) { + List> approvalSignNameList = this.baseMapper.approvalSignName(); + Map approvalSignNameMap = approvalSignNameList.stream().collect(Collectors.toMap( + e -> Long.valueOf(String.valueOf(e.get("id"))), e -> String.valueOf(e.get("signName")) + )); + String approvalSignNames = ""; + String[] approvalSignIds = certificateReport.getApprovalSignIds().split(","); + for (String approvalSignId : approvalSignIds) { + approvalSignNames += approvalSignNameMap.get(Long.valueOf(approvalSignId))+ ","; + } + approvalSignNames = approvalSignNames.substring(0, approvalSignNames.length() - 1); + certificateReport.setApprovalSignName(approvalSignNames); + } + } + private List handleApprovalListResponse(List approvalList, String status) { approvalList.stream().forEach(result -> { //审批状态两种获取方式:1、在此处设置,2、在flowable中设置业务状态,暂采取1 @@ -439,7 +458,7 @@ AuthUser authUser = ShiroKit.getUser(); certificateReport.setCreateUser(authUser.getId()); MeterStaff meterStaff = getMeterStaffInfo(authUser); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); certificateReport.setMeasurePersonId(meterStaff.getId()); certificateReport.setMeasureDeptId(authUser.getDeptId()); certificateReport.setCertificateReportCode(certificateReportNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 4f849b4..e12bad0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -113,7 +113,7 @@ if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(8, 1, 30000, + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); executor.execute(() -> { deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java index 4e2bc25..9103f2e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java @@ -61,8 +61,8 @@ List electronicImageSeals = new ArrayList<>(); ElectronicImage electronicImage = defaultElectronicSignSeal("发证单位"); electronicImageSeals.add(doPopulateElectronicSignSeal(metaData.getSignId(), electronicImage, filePrintRegister)); - if (StringUtils.isNotEmpty(metaData.getApprovalSignId())) { - String[] approvalSignIds = metaData.getApprovalSignId().split(","); + if (StringUtils.isNotEmpty(metaData.getApprovalSignIds())) { + String[] approvalSignIds = metaData.getApprovalSignIds().split(","); List electronicImages = autoCreteAbsoluteSignSealByNumber(approvalSignIds.length); for (int i = 0; i < approvalSignIds.length; i++) { electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(approvalSignIds[i]), electronicImages.get(i), filePrintRegister)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index 9cbeac6..b44f38a 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -8,10 +8,12 @@ import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +37,8 @@ Long selectMaxCode(String prefix); BusinessCertificateReport detailById( @Param("id") Long id); + @MapKey("id") + List> approvalSignName(); @Select("SELECT count(id) from business_certificate_report where approval_status =4 and certificate_report_code = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(Long sampleId,Long orderId); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 3aa3520..694e5e6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -244,13 +244,17 @@ + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index a8a331c..58ca71e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -124,9 +124,9 @@ /** * 认可标志专用章id(签章表id) */ - @TableField("approval_sign_id") + @TableField("approval_sign_ids") @ApiModelProperty(value = "认可标志专用章ids", dataType = "Long") - private String approvalSignId; + private String approvalSignIds; /** * 证书报告附件(minio存储文件名) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index ed19375..ecc8618 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -150,13 +150,14 @@ public BusinessCertificateReport certificateReportDetail(Long id) { // BusinessCertificateReport certificateReport = this.baseMapper.selectById(id); BusinessCertificateReport certificateReport = this.baseMapper.detailById(id); + getApprovalSignName(certificateReport); if (certificateReport.getOriginalRecordId() != null) { try { certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if(Objects.isNull(certificateReport.getBusinessOriginalRecord())){ + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType())); + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); } catch (Exception e) { e.printStackTrace(); } @@ -174,7 +175,7 @@ @Transactional public ReturnDTO submitCertificateReport(BaseApprovalSubmitRequest request) { //已取消后的提交需先删除原有实例 - if (StringUtils.isNotEmpty(request.getProcessId())){ + if (StringUtils.isNotEmpty(request.getProcessId())) { runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED); runtimeService.deleteProcessInstance(request.getProcessId(), "删除"); } @@ -282,7 +283,6 @@ } - /** * 客户、样品详情列表 */ @@ -420,6 +420,25 @@ return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList()); } + /** + * 设置多项认可章的属性 + */ + private void getApprovalSignName(BusinessCertificateReport certificateReport) { + if (StringUtils.isNotEmpty(certificateReport.getApprovalSignIds())) { + List> approvalSignNameList = this.baseMapper.approvalSignName(); + Map approvalSignNameMap = approvalSignNameList.stream().collect(Collectors.toMap( + e -> Long.valueOf(String.valueOf(e.get("id"))), e -> String.valueOf(e.get("signName")) + )); + String approvalSignNames = ""; + String[] approvalSignIds = certificateReport.getApprovalSignIds().split(","); + for (String approvalSignId : approvalSignIds) { + approvalSignNames += approvalSignNameMap.get(Long.valueOf(approvalSignId))+ ","; + } + approvalSignNames = approvalSignNames.substring(0, approvalSignNames.length() - 1); + certificateReport.setApprovalSignName(approvalSignNames); + } + } + private List handleApprovalListResponse(List approvalList, String status) { approvalList.stream().forEach(result -> { //审批状态两种获取方式:1、在此处设置,2、在flowable中设置业务状态,暂采取1 @@ -439,7 +458,7 @@ AuthUser authUser = ShiroKit.getUser(); certificateReport.setCreateUser(authUser.getId()); MeterStaff meterStaff = getMeterStaffInfo(authUser); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); certificateReport.setMeasurePersonId(meterStaff.getId()); certificateReport.setMeasureDeptId(authUser.getDeptId()); certificateReport.setCertificateReportCode(certificateReportNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 4f849b4..e12bad0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -113,7 +113,7 @@ if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(8, 1, 30000, + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); executor.execute(() -> { deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java index 4e2bc25..9103f2e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java @@ -61,8 +61,8 @@ List electronicImageSeals = new ArrayList<>(); ElectronicImage electronicImage = defaultElectronicSignSeal("发证单位"); electronicImageSeals.add(doPopulateElectronicSignSeal(metaData.getSignId(), electronicImage, filePrintRegister)); - if (StringUtils.isNotEmpty(metaData.getApprovalSignId())) { - String[] approvalSignIds = metaData.getApprovalSignId().split(","); + if (StringUtils.isNotEmpty(metaData.getApprovalSignIds())) { + String[] approvalSignIds = metaData.getApprovalSignIds().split(","); List electronicImages = autoCreteAbsoluteSignSealByNumber(approvalSignIds.length); for (int i = 0; i < approvalSignIds.length; i++) { electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(approvalSignIds[i]), electronicImages.get(i), filePrintRegister)); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/TestReportPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/TestReportPrintFileData.java index 31ea884..f38a04c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/TestReportPrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/TestReportPrintFileData.java @@ -60,8 +60,8 @@ List electronicImageSeals = new ArrayList<>(); ElectronicImage electronicImage = defaultElectronicSignSeal("发证单位"); electronicImageSeals.add(doPopulateElectronicSignSeal(metaData.getSignId(), electronicImage, filePrintRegister)); - if (StringUtils.isNotEmpty(metaData.getApprovalSignId())) { - String[] approvalSignIds = metaData.getApprovalSignId().split(","); + if (StringUtils.isNotEmpty(metaData.getApprovalSignIds())) { + String[] approvalSignIds = metaData.getApprovalSignIds().split(","); List electronicImages = autoCreteAbsoluteSignSealByNumber(approvalSignIds.length); for (int i = 0; i < approvalSignIds.length; i++) { electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(approvalSignIds[i]), electronicImages.get(i), filePrintRegister)); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index 9cbeac6..b44f38a 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -8,10 +8,12 @@ import com.casic.missiles.dto.customer.CertificationResponse; import com.casic.missiles.dto.customer.sample.CustomerSampleIdRequest; import com.casic.missiles.model.business.BusinessCertificateReport; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** *

@@ -35,6 +37,8 @@ Long selectMaxCode(String prefix); BusinessCertificateReport detailById( @Param("id") Long id); + @MapKey("id") + List> approvalSignName(); @Select("SELECT count(id) from business_certificate_report where approval_status =4 and certificate_report_code = #{sampleId} and order_id=#{orderId}") Long selectSampleCertifications(Long sampleId,Long orderId); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 3aa3520..694e5e6 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -244,13 +244,17 @@ + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java index a8a331c..58ca71e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessCertificateReport.java @@ -124,9 +124,9 @@ /** * 认可标志专用章id(签章表id) */ - @TableField("approval_sign_id") + @TableField("approval_sign_ids") @ApiModelProperty(value = "认可标志专用章ids", dataType = "Long") - private String approvalSignId; + private String approvalSignIds; /** * 证书报告附件(minio存储文件名) diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java index ed19375..ecc8618 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificateReportServiceImpl.java @@ -150,13 +150,14 @@ public BusinessCertificateReport certificateReportDetail(Long id) { // BusinessCertificateReport certificateReport = this.baseMapper.selectById(id); BusinessCertificateReport certificateReport = this.baseMapper.detailById(id); + getApprovalSignName(certificateReport); if (certificateReport.getOriginalRecordId() != null) { try { certificateReport.setBusinessOriginalRecord(originalRecordService.originalDetail(certificateReport.getOriginalRecordId())); - if(Objects.isNull(certificateReport.getBusinessOriginalRecord())){ + if (Objects.isNull(certificateReport.getBusinessOriginalRecord())) { certificateReport.setBusinessOriginalRecord(new BusinessOriginalRecord()); } - certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS,certificateReport.getCertificateReportType())); + certificateReport.setCertificateReportTypeName(dictService.getDictNameByCode(MeterDictEnum.CERTIFICATION_CLASS, certificateReport.getCertificateReportType())); } catch (Exception e) { e.printStackTrace(); } @@ -174,7 +175,7 @@ @Transactional public ReturnDTO submitCertificateReport(BaseApprovalSubmitRequest request) { //已取消后的提交需先删除原有实例 - if (StringUtils.isNotEmpty(request.getProcessId())){ + if (StringUtils.isNotEmpty(request.getProcessId())) { runtimeService.updateBusinessStatus(request.getProcessId(), ApprovalStatusEnum.DELETED); runtimeService.deleteProcessInstance(request.getProcessId(), "删除"); } @@ -282,7 +283,6 @@ } - /** * 客户、样品详情列表 */ @@ -420,6 +420,25 @@ return approvalList.stream().sorted(Comparator.comparing(CertificateReportResponse::getCreateTime).reversed()).collect(Collectors.toList()); } + /** + * 设置多项认可章的属性 + */ + private void getApprovalSignName(BusinessCertificateReport certificateReport) { + if (StringUtils.isNotEmpty(certificateReport.getApprovalSignIds())) { + List> approvalSignNameList = this.baseMapper.approvalSignName(); + Map approvalSignNameMap = approvalSignNameList.stream().collect(Collectors.toMap( + e -> Long.valueOf(String.valueOf(e.get("id"))), e -> String.valueOf(e.get("signName")) + )); + String approvalSignNames = ""; + String[] approvalSignIds = certificateReport.getApprovalSignIds().split(","); + for (String approvalSignId : approvalSignIds) { + approvalSignNames += approvalSignNameMap.get(Long.valueOf(approvalSignId))+ ","; + } + approvalSignNames = approvalSignNames.substring(0, approvalSignNames.length() - 1); + certificateReport.setApprovalSignName(approvalSignNames); + } + } + private List handleApprovalListResponse(List approvalList, String status) { approvalList.stream().forEach(result -> { //审批状态两种获取方式:1、在此处设置,2、在flowable中设置业务状态,暂采取1 @@ -439,7 +458,7 @@ AuthUser authUser = ShiroKit.getUser(); certificateReport.setCreateUser(authUser.getId()); MeterStaff meterStaff = getMeterStaffInfo(authUser); - if(Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); + if (Objects.isNull(meterStaff)) throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_NOT_STAFF); certificateReport.setMeasurePersonId(meterStaff.getId()); certificateReport.setMeasureDeptId(authUser.getDeptId()); certificateReport.setCertificateReportCode(certificateReportNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 4f849b4..e12bad0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -113,7 +113,7 @@ if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } - ThreadPoolExecutor executor = new ThreadPoolExecutor(8, 1, 30000, + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 30000, TimeUnit.MILLISECONDS, new LinkedBlockingDeque()); executor.execute(() -> { deletePrintFile(businessSiteExecutiveLog.getPrintFileName()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java index 4e2bc25..9103f2e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CalibrationPrintFileData.java @@ -61,8 +61,8 @@ List electronicImageSeals = new ArrayList<>(); ElectronicImage electronicImage = defaultElectronicSignSeal("发证单位"); electronicImageSeals.add(doPopulateElectronicSignSeal(metaData.getSignId(), electronicImage, filePrintRegister)); - if (StringUtils.isNotEmpty(metaData.getApprovalSignId())) { - String[] approvalSignIds = metaData.getApprovalSignId().split(","); + if (StringUtils.isNotEmpty(metaData.getApprovalSignIds())) { + String[] approvalSignIds = metaData.getApprovalSignIds().split(","); List electronicImages = autoCreteAbsoluteSignSealByNumber(approvalSignIds.length); for (int i = 0; i < approvalSignIds.length; i++) { electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(approvalSignIds[i]), electronicImages.get(i), filePrintRegister)); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/TestReportPrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/TestReportPrintFileData.java index 31ea884..f38a04c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/TestReportPrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/TestReportPrintFileData.java @@ -60,8 +60,8 @@ List electronicImageSeals = new ArrayList<>(); ElectronicImage electronicImage = defaultElectronicSignSeal("发证单位"); electronicImageSeals.add(doPopulateElectronicSignSeal(metaData.getSignId(), electronicImage, filePrintRegister)); - if (StringUtils.isNotEmpty(metaData.getApprovalSignId())) { - String[] approvalSignIds = metaData.getApprovalSignId().split(","); + if (StringUtils.isNotEmpty(metaData.getApprovalSignIds())) { + String[] approvalSignIds = metaData.getApprovalSignIds().split(","); List electronicImages = autoCreteAbsoluteSignSealByNumber(approvalSignIds.length); for (int i = 0; i < approvalSignIds.length; i++) { electronicImageSeals.add(doPopulateElectronicSignSeal(Long.valueOf(approvalSignIds[i]), electronicImages.get(i), filePrintRegister)); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/EnvironmentalRecordData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/EnvironmentalRecordData.java index 8a3710a..ba5c568 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/EnvironmentalRecordData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/site/EnvironmentalRecordData.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.dto.business.certificate.FilePrintRegister; import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum; +import com.casic.missiles.mapper.meter.MeterStaffMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.equipment.EquipmentFixedAssets; @@ -31,7 +32,7 @@ @Component(PrintFileDataBeanNameAliasEnum.EXTERNAL_ENVIRONMENTAL_RECORD_BEAN) public class EnvironmentalRecordData extends PrintFileDataSupport implements PrintFileDataGeneric { @Resource - private UserMapper userMapper; + private MeterStaffMapper meterStaffMapper; @Resource private IEquipmentFixedAssetsService equipmentFixedAssetsService; @Value("${casic.template.environmental}") @@ -94,7 +95,7 @@ //获取人员ids for (Long userId : workUserIds) { if (ObjectUtils.isNotEmpty(userId)) { - realUserNameValues += userMapper.selectById(userId).getName() + ","; + realUserNameValues += meterStaffMapper.selectById(userId).getName() + ","; } } //处理人员后缀多余逗号