diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java index c3fd8a7..fba4976 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java @@ -74,6 +74,5 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ environmentRequireService.exportFile(exportDTO,response); - } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java index c3fd8a7..fba4976 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java @@ -74,6 +74,5 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ environmentRequireService.exportFile(exportDTO,response); - } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java index c26c172..450ced5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java @@ -21,4 +21,7 @@ @ApiModelProperty(value = "在用状态(字典code)", dataType = "String") private String status; + + @ApiModelProperty(value = "是否为pdf",dataType = "boolean") + private boolean isPdf; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java index c3fd8a7..fba4976 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java @@ -74,6 +74,5 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ environmentRequireService.exportFile(exportDTO,response); - } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java index c26c172..450ced5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java @@ -21,4 +21,7 @@ @ApiModelProperty(value = "在用状态(字典code)", dataType = "String") private String status; + + @ApiModelProperty(value = "是否为pdf",dataType = "boolean") + private boolean isPdf; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index 163e8ef..c370c9c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -142,26 +142,30 @@ statusDetail.setTechnicalTargetList(targetList); statusDetail.setAttachmentList(attachmentList); + if (Objects.nonNull(bizEquipmentStatus)) { Map map = BeanUtil.beanToMap(statusDetail); + //设置主要技术指标 List list = new ArrayList<>(); targetList.forEach(target -> { String targetStr = "序号:" + (targetList.indexOf(target) + 1) + " 检定参数名称:" + target.getMeasureParam() + " 测量范围:" + target.getMeasureRange() + " 不确定度或允许误差极限或准确度等级:" + target.getUncertainty() + " 误差计算指标:" + target.getErrorCalculateIndicators(); list.add(targetStr); }); - String str = list.stream().collect(Collectors.joining(",")); + String str = String.join(",", list); map.put("targetStr", str); String type = bizEquipmentStatus.getApprovalType(); if ("1".equals(type)) { + //打印设备启封申请表 printFileRegister.registerPrintFile(EQUIPMENT_STATUS_ENABLE, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } else if ("2".equals(type)) { + //打印设备封存申请表 //设置附件信息 List attachments = new ArrayList<>(); attachmentList.forEach(attachment -> { String attachmentStr = "序号:" + (attachmentList.indexOf(attachment) + 1) + " 名称:" + attachment.getName() + " 信息:" + attachment.getInformation() + " 位置:" + attachment.getLocation(); attachments.add(attachmentStr); }); - String attachStr = attachments.stream().collect(Collectors.joining(",")); + String attachStr = String.join(",", attachments); map.put("attachmentStr", attachStr); printFileRegister.registerPrintFile(EQUIPMENT_STATUS_UNABLE, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java index c3fd8a7..fba4976 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java @@ -74,6 +74,5 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ environmentRequireService.exportFile(exportDTO,response); - } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java index c26c172..450ced5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java @@ -21,4 +21,7 @@ @ApiModelProperty(value = "在用状态(字典code)", dataType = "String") private String status; + + @ApiModelProperty(value = "是否为pdf",dataType = "boolean") + private boolean isPdf; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index 163e8ef..c370c9c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -142,26 +142,30 @@ statusDetail.setTechnicalTargetList(targetList); statusDetail.setAttachmentList(attachmentList); + if (Objects.nonNull(bizEquipmentStatus)) { Map map = BeanUtil.beanToMap(statusDetail); + //设置主要技术指标 List list = new ArrayList<>(); targetList.forEach(target -> { String targetStr = "序号:" + (targetList.indexOf(target) + 1) + " 检定参数名称:" + target.getMeasureParam() + " 测量范围:" + target.getMeasureRange() + " 不确定度或允许误差极限或准确度等级:" + target.getUncertainty() + " 误差计算指标:" + target.getErrorCalculateIndicators(); list.add(targetStr); }); - String str = list.stream().collect(Collectors.joining(",")); + String str = String.join(",", list); map.put("targetStr", str); String type = bizEquipmentStatus.getApprovalType(); if ("1".equals(type)) { + //打印设备启封申请表 printFileRegister.registerPrintFile(EQUIPMENT_STATUS_ENABLE, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } else if ("2".equals(type)) { + //打印设备封存申请表 //设置附件信息 List attachments = new ArrayList<>(); attachmentList.forEach(attachment -> { String attachmentStr = "序号:" + (attachmentList.indexOf(attachment) + 1) + " 名称:" + attachment.getName() + " 信息:" + attachment.getInformation() + " 位置:" + attachment.getLocation(); attachments.add(attachmentStr); }); - String attachStr = attachments.stream().collect(Collectors.joining(",")); + String attachStr = String.join(",", attachments); map.put("attachmentStr", attachStr); printFileRegister.registerPrintFile(EQUIPMENT_STATUS_UNABLE, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java index 94aae3c..68c8659 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java @@ -117,15 +117,15 @@ for (BizResourceSealInfo sealInfo : list) { int seq = list.indexOf(sealInfo) + 1; sealInfo.setSeq(seq); - if (StringUtils.isNotBlank(sealInfo.getApplyTime())){ + if (StringUtils.isNotBlank(sealInfo.getApplyTime())) { String applyTime = DateUtil.formatDate(DateUtil.parseDate(sealInfo.getApplyTime())); sealInfo.setApplyTime(applyTime); } - if (StringUtils.isNotBlank(sealInfo.getRatifyTime())){ + if (StringUtils.isNotBlank(sealInfo.getRatifyTime())) { String ratifyTime = DateUtil.formatDate(DateUtil.parseDate(sealInfo.getRatifyTime())); sealInfo.setRatifyTime(ratifyTime); } - if (StringUtils.isNotBlank(sealInfo.getAbandonTime())){ + if (StringUtils.isNotBlank(sealInfo.getAbandonTime())) { String abandonTime = DateUtil.formatDate(DateUtil.parseDate(sealInfo.getAbandonTime())); sealInfo.setAbandonTime(abandonTime); } @@ -133,7 +133,7 @@ if (CollectionUtils.isNotEmpty(sealInfoPage.getRecords())) { Map map = new HashMap<>(); map.put("sealList", sealInfoPage.getRecords()); - printFileRegister.registerPrintFile(RESOURCE_SEAL_INFO, EXPORT_TEMPLATE, null, map, true, response); + printFileRegister.registerPrintFile(RESOURCE_SEAL_INFO, EXPORT_TEMPLATE, null, map, request.isPdf(), response); } } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java index c3fd8a7..fba4976 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceEnvironmentRequireController.java @@ -74,6 +74,5 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ environmentRequireService.exportFile(exportDTO,response); - } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java index c26c172..450ced5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/seal/SealInfoListRequest.java @@ -21,4 +21,7 @@ @ApiModelProperty(value = "在用状态(字典code)", dataType = "String") private String status; + + @ApiModelProperty(value = "是否为pdf",dataType = "boolean") + private boolean isPdf; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java index 163e8ef..c370c9c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentStatusServiceImpl.java @@ -142,26 +142,30 @@ statusDetail.setTechnicalTargetList(targetList); statusDetail.setAttachmentList(attachmentList); + if (Objects.nonNull(bizEquipmentStatus)) { Map map = BeanUtil.beanToMap(statusDetail); + //设置主要技术指标 List list = new ArrayList<>(); targetList.forEach(target -> { String targetStr = "序号:" + (targetList.indexOf(target) + 1) + " 检定参数名称:" + target.getMeasureParam() + " 测量范围:" + target.getMeasureRange() + " 不确定度或允许误差极限或准确度等级:" + target.getUncertainty() + " 误差计算指标:" + target.getErrorCalculateIndicators(); list.add(targetStr); }); - String str = list.stream().collect(Collectors.joining(",")); + String str = String.join(",", list); map.put("targetStr", str); String type = bizEquipmentStatus.getApprovalType(); if ("1".equals(type)) { + //打印设备启封申请表 printFileRegister.registerPrintFile(EQUIPMENT_STATUS_ENABLE, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } else if ("2".equals(type)) { + //打印设备封存申请表 //设置附件信息 List attachments = new ArrayList<>(); attachmentList.forEach(attachment -> { String attachmentStr = "序号:" + (attachmentList.indexOf(attachment) + 1) + " 名称:" + attachment.getName() + " 信息:" + attachment.getInformation() + " 位置:" + attachment.getLocation(); attachments.add(attachmentStr); }); - String attachStr = attachments.stream().collect(Collectors.joining(",")); + String attachStr = String.join(",", attachments); map.put("attachmentStr", attachStr); printFileRegister.registerPrintFile(EQUIPMENT_STATUS_UNABLE, EXPORT_TEMPLATE, null, map, exportDTO.isPdf(), response); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java index 94aae3c..68c8659 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceSealInfoServiceImpl.java @@ -117,15 +117,15 @@ for (BizResourceSealInfo sealInfo : list) { int seq = list.indexOf(sealInfo) + 1; sealInfo.setSeq(seq); - if (StringUtils.isNotBlank(sealInfo.getApplyTime())){ + if (StringUtils.isNotBlank(sealInfo.getApplyTime())) { String applyTime = DateUtil.formatDate(DateUtil.parseDate(sealInfo.getApplyTime())); sealInfo.setApplyTime(applyTime); } - if (StringUtils.isNotBlank(sealInfo.getRatifyTime())){ + if (StringUtils.isNotBlank(sealInfo.getRatifyTime())) { String ratifyTime = DateUtil.formatDate(DateUtil.parseDate(sealInfo.getRatifyTime())); sealInfo.setRatifyTime(ratifyTime); } - if (StringUtils.isNotBlank(sealInfo.getAbandonTime())){ + if (StringUtils.isNotBlank(sealInfo.getAbandonTime())) { String abandonTime = DateUtil.formatDate(DateUtil.parseDate(sealInfo.getAbandonTime())); sealInfo.setAbandonTime(abandonTime); } @@ -133,7 +133,7 @@ if (CollectionUtils.isNotEmpty(sealInfoPage.getRecords())) { Map map = new HashMap<>(); map.put("sealList", sealInfoPage.getRecords()); - printFileRegister.registerPrintFile(RESOURCE_SEAL_INFO, EXPORT_TEMPLATE, null, map, true, response); + printFileRegister.registerPrintFile(RESOURCE_SEAL_INFO, EXPORT_TEMPLATE, null, map, request.isPdf(), response); } } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java index d446213..ac0f4e0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceTrainInfoServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; @@ -134,6 +135,7 @@ @Override public void trainExportFile(TrainListRequest request, HttpServletResponse response) throws Exception { + Page page = PageFactory.defaultPage(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(StringUtils.isNotEmpty(request.getTrainNo()), BizResourceTrainInfo::getTrainNo, request.getTrainNo()); queryWrapper.like(StringUtils.isNotEmpty(request.getDutyLeader()), BizResourceTrainInfo::getDutyLeader, request.getDutyLeader()); @@ -145,7 +147,8 @@ } queryWrapper.orderByDesc(BizResourceTrainInfo::getCreateTime); - List trainInfoList = trainInfoMapper.selectList(queryWrapper); + Page pageInfo = trainInfoMapper.selectPage(page, queryWrapper); + List trainInfoList = pageInfo.getRecords(); for (BizResourceTrainInfo trainInfo : trainInfoList) { DictCodeUtils.convertDictCodeToName(trainInfo); // DictCodeUtils.convertDictCodeToName(trainInfo.getTrainContent());