diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 03fe5c9..8513729 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -182,7 +182,6 @@ resultApprovalPage = handlerBeApproved(resultApprovalPage, page, request); } else if (ApprovalStatusEnum.ALL.equals(request.getApprovalStatus())) { //查询所有证书报告,保证所有证书都可展示在这里被提交打印审批 - request.setCreateUserId(null); request.setApprovalStatus(null); request.setPrintStatus(null); resultApprovalPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java index 03fe5c9..8513729 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessCertificatePrintServiceImpl.java @@ -182,7 +182,6 @@ resultApprovalPage = handlerBeApproved(resultApprovalPage, page, request); } else if (ApprovalStatusEnum.ALL.equals(request.getApprovalStatus())) { //查询所有证书报告,保证所有证书都可展示在这里被提交打印审批 - request.setCreateUserId(null); request.setApprovalStatus(null); request.setPrintStatus(null); resultApprovalPage = certificatePrintMapper.selectBatchForApprovalList(page, request, null); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java index f960d26..4b5cbfb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationHandler.java @@ -143,6 +143,14 @@ log.debug("校验没有原始记录"); return null; } + if (CollectionUtils.isEmpty(measureItemInfo.getMeasureDataCalibratorList())) { + for (BizBusinessDeviceMeasureDataCalibrator measureDataCalibrator : measureItemInfo.getMeasureDataCalibratorList()) { + //最大允许误差 + if (StringUtils.isNotEmpty(measureDataCalibrator.getMaximumError()) && measureDataCalibrator.getMaximumError().contains("±")) { + measureDataCalibrator.setMaximumError("±" + measureDataCalibrator.getMaximumError()); + } + } + } Map map = BeanUtil.beanToMap(measureItemInfo); List customTemplateUrls = new ArrayList<>(); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); @@ -199,6 +207,13 @@ List bizBusinessDeviceMeasureDataCalibrators = new ArrayList<>(); bizBusinessDeviceMeasureDataCalibrators.add(new BizBusinessDeviceMeasureDataCalibrator()); measureItemInfo.setMeasureDataCalibratorList(bizBusinessDeviceMeasureDataCalibrators); + } else { + for (BizBusinessDeviceMeasureDataCalibrator measureDataCalibrator : measureItemInfo.getMeasureDataCalibratorList()) { + //最大允许误差 + if (StringUtils.isNotEmpty(measureDataCalibrator.getMaximumError()) && measureDataCalibrator.getMaximumError().contains("±")) { + measureDataCalibrator.setMaximumError("±" + measureDataCalibrator.getMaximumError()); + } + } } Map map = BeanUtil.beanToMap(measureItemInfo); //准备封面参数 @@ -280,7 +295,9 @@ if (ObjectUtils.isNotEmpty(map.get(MEASURE_VALID_DATE))) { String measureValidDate = (String) map.get(MEASURE_VALID_DATE); try { - map.put(MEASURE_DATE, new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(measureValidDate))); + if(measureValidDate.contains("-")){ + map.put(MEASURE_DATE, new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(measureValidDate))); + } } catch (Exception e) { throw new BusinessException(1500, String.format(measureValidDate, "检定有效日期,格式不正确")); }