diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java index 5d539e4..6893d3e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java @@ -2,6 +2,7 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -40,6 +42,13 @@ super(baseApprovalService); } + @ApiOperation("导出word/pdf/打印") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + unpackAcceptService.exportFile(exportDTO, response); + } + + @ApiOperation("草稿箱-保存") @PostMapping("/save") public ReturnDTO save(@RequestBody @Valid BizEquipmentUnpackAccept request) { @@ -58,4 +67,5 @@ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return unpackAcceptService.detail(idDTO.getId()); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java index 5d539e4..6893d3e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java @@ -2,6 +2,7 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -40,6 +42,13 @@ super(baseApprovalService); } + @ApiOperation("导出word/pdf/打印") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + unpackAcceptService.exportFile(exportDTO, response); + } + + @ApiOperation("草稿箱-保存") @PostMapping("/save") public ReturnDTO save(@RequestBody @Valid BizEquipmentUnpackAccept request) { @@ -58,4 +67,5 @@ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return unpackAcceptService.detail(idDTO.getId()); } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index cdb214d..899da06 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -11,6 +11,7 @@ String SUPPLIER = "合格供方名录"; String OUTSOURCE_PROTOCOL = "测试、校准或检定工作分包协议书"; String OUTSOURCE_ASSESS = "测试、校准或检定工作分包评审表"; + String OUT_ASSESS = "测试、校准或检定工作分包评审表"; String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java index 5d539e4..6893d3e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java @@ -2,6 +2,7 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -40,6 +42,13 @@ super(baseApprovalService); } + @ApiOperation("导出word/pdf/打印") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + unpackAcceptService.exportFile(exportDTO, response); + } + + @ApiOperation("草稿箱-保存") @PostMapping("/save") public ReturnDTO save(@RequestBody @Valid BizEquipmentUnpackAccept request) { @@ -58,4 +67,5 @@ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return unpackAcceptService.detail(idDTO.getId()); } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index cdb214d..899da06 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -11,6 +11,7 @@ String SUPPLIER = "合格供方名录"; String OUTSOURCE_PROTOCOL = "测试、校准或检定工作分包协议书"; String OUTSOURCE_ASSESS = "测试、校准或检定工作分包评审表"; + String OUT_ASSESS = "测试、校准或检定工作分包评审表"; String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index d2a12a9..0b25a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -55,7 +55,7 @@ //使用受检设备规格型号表id字段 public Long getDeviceModelId() { - if(Objects.isNull(deviceModelId)){ + if (Objects.isNull(deviceModelId)) { return eqptDeviceModelId; } return deviceModelId; @@ -71,7 +71,7 @@ //只有一个检定项时该字段为,为空时使用受检设备设备类型字段 public String getDeviceType() { - if(StringUtils.isEmpty(deviceType)){ + if (StringUtils.isEmpty(deviceType)) { return eqptDeviceType; } return deviceType; @@ -127,7 +127,7 @@ private String dataSyncStr; public String getDataSyncStr() { - if(Objects.nonNull(dataSync) && dataSync.equals(1)){ + if (Objects.nonNull(dataSync) && dataSync.equals(1)) { return "是"; } return "否"; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java index 5d539e4..6893d3e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java @@ -2,6 +2,7 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -40,6 +42,13 @@ super(baseApprovalService); } + @ApiOperation("导出word/pdf/打印") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + unpackAcceptService.exportFile(exportDTO, response); + } + + @ApiOperation("草稿箱-保存") @PostMapping("/save") public ReturnDTO save(@RequestBody @Valid BizEquipmentUnpackAccept request) { @@ -58,4 +67,5 @@ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return unpackAcceptService.detail(idDTO.getId()); } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index cdb214d..899da06 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -11,6 +11,7 @@ String SUPPLIER = "合格供方名录"; String OUTSOURCE_PROTOCOL = "测试、校准或检定工作分包协议书"; String OUTSOURCE_ASSESS = "测试、校准或检定工作分包评审表"; + String OUT_ASSESS = "测试、校准或检定工作分包评审表"; String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index d2a12a9..0b25a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -55,7 +55,7 @@ //使用受检设备规格型号表id字段 public Long getDeviceModelId() { - if(Objects.isNull(deviceModelId)){ + if (Objects.isNull(deviceModelId)) { return eqptDeviceModelId; } return deviceModelId; @@ -71,7 +71,7 @@ //只有一个检定项时该字段为,为空时使用受检设备设备类型字段 public String getDeviceType() { - if(StringUtils.isEmpty(deviceType)){ + if (StringUtils.isEmpty(deviceType)) { return eqptDeviceType; } return deviceType; @@ -127,7 +127,7 @@ private String dataSyncStr; public String getDataSyncStr() { - if(Objects.nonNull(dataSync) && dataSync.equals(1)){ + if (Objects.nonNull(dataSync) && dataSync.equals(1)) { return "是"; } return "否"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f4f5e4c..e1953b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -123,7 +123,7 @@ request.setOriginalRecordFile(originalRecordFileUrl); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); //更新记录文件 -// bizBusinessMapper.updateById(request); + bizBusinessMapper.updateById(request); } catch (Exception ex) { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } @@ -217,6 +217,13 @@ * 填充固定的信息参数 */ private void prepareCoverParams(Map map, String labCode) { + //技术文件处理 + if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) { + //技术文件用逗号隔开 + String[] technologyFiles = ((String) map.get("technologyFile")).split(","); + List technologyFileList = Arrays.asList(technologyFiles); + map.put("technologyFileList", technologyFileList); + } //健壮性校验 if (StringUtils.isEmpty(labCode)) { log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java index 5d539e4..6893d3e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java @@ -2,6 +2,7 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -40,6 +42,13 @@ super(baseApprovalService); } + @ApiOperation("导出word/pdf/打印") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + unpackAcceptService.exportFile(exportDTO, response); + } + + @ApiOperation("草稿箱-保存") @PostMapping("/save") public ReturnDTO save(@RequestBody @Valid BizEquipmentUnpackAccept request) { @@ -58,4 +67,5 @@ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return unpackAcceptService.detail(idDTO.getId()); } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index cdb214d..899da06 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -11,6 +11,7 @@ String SUPPLIER = "合格供方名录"; String OUTSOURCE_PROTOCOL = "测试、校准或检定工作分包协议书"; String OUTSOURCE_ASSESS = "测试、校准或检定工作分包评审表"; + String OUT_ASSESS = "测试、校准或检定工作分包评审表"; String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index d2a12a9..0b25a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -55,7 +55,7 @@ //使用受检设备规格型号表id字段 public Long getDeviceModelId() { - if(Objects.isNull(deviceModelId)){ + if (Objects.isNull(deviceModelId)) { return eqptDeviceModelId; } return deviceModelId; @@ -71,7 +71,7 @@ //只有一个检定项时该字段为,为空时使用受检设备设备类型字段 public String getDeviceType() { - if(StringUtils.isEmpty(deviceType)){ + if (StringUtils.isEmpty(deviceType)) { return eqptDeviceType; } return deviceType; @@ -127,7 +127,7 @@ private String dataSyncStr; public String getDataSyncStr() { - if(Objects.nonNull(dataSync) && dataSync.equals(1)){ + if (Objects.nonNull(dataSync) && dataSync.equals(1)) { return "是"; } return "否"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f4f5e4c..e1953b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -123,7 +123,7 @@ request.setOriginalRecordFile(originalRecordFileUrl); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); //更新记录文件 -// bizBusinessMapper.updateById(request); + bizBusinessMapper.updateById(request); } catch (Exception ex) { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } @@ -217,6 +217,13 @@ * 填充固定的信息参数 */ private void prepareCoverParams(Map map, String labCode) { + //技术文件处理 + if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) { + //技术文件用逗号隔开 + String[] technologyFiles = ((String) map.get("technologyFile")).split(","); + List technologyFileList = Arrays.asList(technologyFiles); + map.put("technologyFileList", technologyFileList); + } //健壮性校验 if (StringUtils.isEmpty(labCode)) { log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index ba6d129..4fc20d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -1,12 +1,15 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.outsource.OutsourceAssessDetailResponse; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; import com.casic.missiles.dto.equipment.UnpackAcceptSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,15 +23,20 @@ import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.equipment.IBizEquipmentUnpackAcceptAttachmentService; import com.casic.missiles.service.equipment.IBizEquipmentUnpackAcceptService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -41,6 +49,8 @@ public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; + @Autowired + private PrintFileRegister printFileRegister; @Override @Transactional @@ -61,7 +71,7 @@ //主附件信息 List attachmentList = request.getAttachmentList(); attachmentList.forEach(equip -> equip.setLogId(request.getId())); - if(!acceptAttachmentService.saveBatch(attachmentList)){ + if (!acceptAttachmentService.saveBatch(attachmentList)) { throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED); } UnpackAcceptSaveResponse saveResponse = new UnpackAcceptSaveResponse(); @@ -83,6 +93,21 @@ } @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) throws Exception { + BizEquipmentUnpackAccept unpackAccept = this.baseMapper.selectById(exportDTO.getId()); + DictCodeUtils.convertDictCodeToName(unpackAccept); + //主附件信息 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("log_id", exportDTO.getId()); + List attachmentList = acceptAttachmentService.list(wrapper); + unpackAccept.setAttachmentList(attachmentList); + if(Objects.nonNull(unpackAccept)){ + Map map = BeanUtil.beanToMap(unpackAccept); + printFileRegister.registerPrintFile(OUTSOURCE_ASSESS, "1", null, map, exportDTO.isPdf(), response); + } + } + + @Override @Transactional public ReturnDTO draftUpdate(BizEquipmentUnpackAccept request) { if (this.baseMapper.updateById(request) > 0) { @@ -134,7 +159,7 @@ private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); - if(acceptAttachmentService.remove(wrapper)){ + if (acceptAttachmentService.remove(wrapper)) { return; } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -145,7 +170,7 @@ attachmentList.forEach(log -> { log.setLogId(request.getId()); }); - if(acceptAttachmentService.saveBatch(attachmentList)){ + if (acceptAttachmentService.saveBatch(attachmentList)) { return; } throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java index 5d539e4..6893d3e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java @@ -2,6 +2,7 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -40,6 +42,13 @@ super(baseApprovalService); } + @ApiOperation("导出word/pdf/打印") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + unpackAcceptService.exportFile(exportDTO, response); + } + + @ApiOperation("草稿箱-保存") @PostMapping("/save") public ReturnDTO save(@RequestBody @Valid BizEquipmentUnpackAccept request) { @@ -58,4 +67,5 @@ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return unpackAcceptService.detail(idDTO.getId()); } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index cdb214d..899da06 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -11,6 +11,7 @@ String SUPPLIER = "合格供方名录"; String OUTSOURCE_PROTOCOL = "测试、校准或检定工作分包协议书"; String OUTSOURCE_ASSESS = "测试、校准或检定工作分包评审表"; + String OUT_ASSESS = "测试、校准或检定工作分包评审表"; String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index d2a12a9..0b25a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -55,7 +55,7 @@ //使用受检设备规格型号表id字段 public Long getDeviceModelId() { - if(Objects.isNull(deviceModelId)){ + if (Objects.isNull(deviceModelId)) { return eqptDeviceModelId; } return deviceModelId; @@ -71,7 +71,7 @@ //只有一个检定项时该字段为,为空时使用受检设备设备类型字段 public String getDeviceType() { - if(StringUtils.isEmpty(deviceType)){ + if (StringUtils.isEmpty(deviceType)) { return eqptDeviceType; } return deviceType; @@ -127,7 +127,7 @@ private String dataSyncStr; public String getDataSyncStr() { - if(Objects.nonNull(dataSync) && dataSync.equals(1)){ + if (Objects.nonNull(dataSync) && dataSync.equals(1)) { return "是"; } return "否"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f4f5e4c..e1953b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -123,7 +123,7 @@ request.setOriginalRecordFile(originalRecordFileUrl); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); //更新记录文件 -// bizBusinessMapper.updateById(request); + bizBusinessMapper.updateById(request); } catch (Exception ex) { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } @@ -217,6 +217,13 @@ * 填充固定的信息参数 */ private void prepareCoverParams(Map map, String labCode) { + //技术文件处理 + if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) { + //技术文件用逗号隔开 + String[] technologyFiles = ((String) map.get("technologyFile")).split(","); + List technologyFileList = Arrays.asList(technologyFiles); + map.put("technologyFileList", technologyFileList); + } //健壮性校验 if (StringUtils.isEmpty(labCode)) { log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index ba6d129..4fc20d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -1,12 +1,15 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.outsource.OutsourceAssessDetailResponse; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; import com.casic.missiles.dto.equipment.UnpackAcceptSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,15 +23,20 @@ import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.equipment.IBizEquipmentUnpackAcceptAttachmentService; import com.casic.missiles.service.equipment.IBizEquipmentUnpackAcceptService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -41,6 +49,8 @@ public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; + @Autowired + private PrintFileRegister printFileRegister; @Override @Transactional @@ -61,7 +71,7 @@ //主附件信息 List attachmentList = request.getAttachmentList(); attachmentList.forEach(equip -> equip.setLogId(request.getId())); - if(!acceptAttachmentService.saveBatch(attachmentList)){ + if (!acceptAttachmentService.saveBatch(attachmentList)) { throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED); } UnpackAcceptSaveResponse saveResponse = new UnpackAcceptSaveResponse(); @@ -83,6 +93,21 @@ } @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) throws Exception { + BizEquipmentUnpackAccept unpackAccept = this.baseMapper.selectById(exportDTO.getId()); + DictCodeUtils.convertDictCodeToName(unpackAccept); + //主附件信息 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("log_id", exportDTO.getId()); + List attachmentList = acceptAttachmentService.list(wrapper); + unpackAccept.setAttachmentList(attachmentList); + if(Objects.nonNull(unpackAccept)){ + Map map = BeanUtil.beanToMap(unpackAccept); + printFileRegister.registerPrintFile(OUTSOURCE_ASSESS, "1", null, map, exportDTO.isPdf(), response); + } + } + + @Override @Transactional public ReturnDTO draftUpdate(BizEquipmentUnpackAccept request) { if (this.baseMapper.updateById(request) > 0) { @@ -134,7 +159,7 @@ private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); - if(acceptAttachmentService.remove(wrapper)){ + if (acceptAttachmentService.remove(wrapper)) { return; } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -145,7 +170,7 @@ attachmentList.forEach(log -> { log.setLogId(request.getId()); }); - if(acceptAttachmentService.saveBatch(attachmentList)){ + if (acceptAttachmentService.saveBatch(attachmentList)) { return; } throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentUnpackAcceptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentUnpackAcceptService.java index 2165d7b..4c48515 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentUnpackAcceptService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentUnpackAcceptService.java @@ -1,11 +1,16 @@ package com.casic.missiles.service.equipment; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; import com.casic.missiles.dto.equipment.UnpackAcceptSaveResponse; import com.casic.missiles.model.equipment.BizEquipmentUnpackAccept; import com.casic.missiles.service.IGeneralApprovalService; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; /** *

@@ -20,4 +25,6 @@ ReturnDTO saveUnpackAccept(BizEquipmentUnpackAccept request); ReturnDTO detail(Long id) throws Exception; + + void exportFile(ExportDTO exportDTO, HttpServletResponse response) throws Exception; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java index 5d539e4..6893d3e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/equipment/BizEquipmentUnpackAcceptController.java @@ -2,6 +2,7 @@ import com.casic.missiles.controller.GeneralApprovalController; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -40,6 +42,13 @@ super(baseApprovalService); } + @ApiOperation("导出word/pdf/打印") + @PostMapping("/exportFile") + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { + unpackAcceptService.exportFile(exportDTO, response); + } + + @ApiOperation("草稿箱-保存") @PostMapping("/save") public ReturnDTO save(@RequestBody @Valid BizEquipmentUnpackAccept request) { @@ -58,4 +67,5 @@ public ReturnDTO detail(@RequestBody @Valid IdDTO idDTO) throws Exception { return unpackAcceptService.detail(idDTO.getId()); } + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java index cdb214d..899da06 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrintFileModuleNameEnum.java @@ -11,6 +11,7 @@ String SUPPLIER = "合格供方名录"; String OUTSOURCE_PROTOCOL = "测试、校准或检定工作分包协议书"; String OUTSOURCE_ASSESS = "测试、校准或检定工作分包评审表"; + String OUT_ASSESS = "测试、校准或检定工作分包评审表"; String OUTSOURCE_NOTICE = "测试、校准或检定工作分包通知表"; String OUTSOURCER = "测试、校准或检定合格分包方名录"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java index d2a12a9..0b25a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureItemInfo.java @@ -55,7 +55,7 @@ //使用受检设备规格型号表id字段 public Long getDeviceModelId() { - if(Objects.isNull(deviceModelId)){ + if (Objects.isNull(deviceModelId)) { return eqptDeviceModelId; } return deviceModelId; @@ -71,7 +71,7 @@ //只有一个检定项时该字段为,为空时使用受检设备设备类型字段 public String getDeviceType() { - if(StringUtils.isEmpty(deviceType)){ + if (StringUtils.isEmpty(deviceType)) { return eqptDeviceType; } return deviceType; @@ -127,7 +127,7 @@ private String dataSyncStr; public String getDataSyncStr() { - if(Objects.nonNull(dataSync) && dataSync.equals(1)){ + if (Objects.nonNull(dataSync) && dataSync.equals(1)) { return "是"; } return "否"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java index f4f5e4c..e1953b5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureApprovalServiceImpl.java @@ -123,7 +123,7 @@ request.setOriginalRecordFile(originalRecordFileUrl); BizBusinessDeviceMeasureApprovalMapper bizBusinessMapper = SpringContextUtil.getBean(BizBusinessDeviceMeasureApprovalMapper.class); //更新记录文件 -// bizBusinessMapper.updateById(request); + bizBusinessMapper.updateById(request); } catch (Exception ex) { throw new BusinessException(BusinessExceptionEnum.MEASURE_APPROVAL_UPDATE_FAILED); } @@ -217,6 +217,13 @@ * 填充固定的信息参数 */ private void prepareCoverParams(Map map, String labCode) { + //技术文件处理 + if (map.containsKey("technologyFile") && ObjectUtils.isNotEmpty(map.get("technologyFile"))) { + //技术文件用逗号隔开 + String[] technologyFiles = ((String) map.get("technologyFile")).split(","); + List technologyFileList = Arrays.asList(technologyFiles); + map.put("technologyFileList", technologyFileList); + } //健壮性校验 if (StringUtils.isEmpty(labCode)) { log.warn("组织接口不能传入为空,打印文档生成文档填充组织失败..."); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java index ba6d129..4fc20d0 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentUnpackAcceptServiceImpl.java @@ -1,12 +1,15 @@ package com.casic.missiles.service.Impl.equipment; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.outsource.OutsourceAssessDetailResponse; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; import com.casic.missiles.dto.equipment.UnpackAcceptSaveResponse; import com.casic.missiles.enums.BusinessExceptionEnum; @@ -20,15 +23,20 @@ import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; import com.casic.missiles.service.equipment.IBizEquipmentUnpackAcceptAttachmentService; import com.casic.missiles.service.equipment.IBizEquipmentUnpackAcceptService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.OUTSOURCE_ASSESS; + /** *

* 设备履历管理-开箱验收管理 服务实现类 @@ -41,6 +49,8 @@ public class BizEquipmentUnpackAcceptServiceImpl extends GeneralApprovalServiceImpl implements IBizEquipmentUnpackAcceptService { @Autowired private IBizEquipmentUnpackAcceptAttachmentService acceptAttachmentService; + @Autowired + private PrintFileRegister printFileRegister; @Override @Transactional @@ -61,7 +71,7 @@ //主附件信息 List attachmentList = request.getAttachmentList(); attachmentList.forEach(equip -> equip.setLogId(request.getId())); - if(!acceptAttachmentService.saveBatch(attachmentList)){ + if (!acceptAttachmentService.saveBatch(attachmentList)) { throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED); } UnpackAcceptSaveResponse saveResponse = new UnpackAcceptSaveResponse(); @@ -83,6 +93,21 @@ } @Override + public void exportFile(ExportDTO exportDTO, HttpServletResponse response) throws Exception { + BizEquipmentUnpackAccept unpackAccept = this.baseMapper.selectById(exportDTO.getId()); + DictCodeUtils.convertDictCodeToName(unpackAccept); + //主附件信息 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("log_id", exportDTO.getId()); + List attachmentList = acceptAttachmentService.list(wrapper); + unpackAccept.setAttachmentList(attachmentList); + if(Objects.nonNull(unpackAccept)){ + Map map = BeanUtil.beanToMap(unpackAccept); + printFileRegister.registerPrintFile(OUTSOURCE_ASSESS, "1", null, map, exportDTO.isPdf(), response); + } + } + + @Override @Transactional public ReturnDTO draftUpdate(BizEquipmentUnpackAccept request) { if (this.baseMapper.updateById(request) > 0) { @@ -134,7 +159,7 @@ private void removeRelationData(Long logId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("log_id", logId); - if(acceptAttachmentService.remove(wrapper)){ + if (acceptAttachmentService.remove(wrapper)) { return; } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -145,7 +170,7 @@ attachmentList.forEach(log -> { log.setLogId(request.getId()); }); - if(acceptAttachmentService.saveBatch(attachmentList)){ + if (acceptAttachmentService.saveBatch(attachmentList)) { return; } throw new BusinessException(BusinessExceptionEnum.DRAFT_SAVE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentUnpackAcceptService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentUnpackAcceptService.java index 2165d7b..4c48515 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentUnpackAcceptService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IBizEquipmentUnpackAcceptService.java @@ -1,11 +1,16 @@ package com.casic.missiles.service.equipment; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.equipment.UnpackAcceptApprovalListRequest; import com.casic.missiles.dto.equipment.UnpackAcceptSaveResponse; import com.casic.missiles.model.equipment.BizEquipmentUnpackAccept; import com.casic.missiles.service.IGeneralApprovalService; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; /** *

@@ -20,4 +25,6 @@ ReturnDTO saveUnpackAccept(BizEquipmentUnpackAccept request); ReturnDTO detail(Long id) throws Exception; + + void exportFile(ExportDTO exportDTO, HttpServletResponse response) throws Exception; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java index ad5e9be..88e3c3a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileSupport.java @@ -37,8 +37,8 @@ */ protected String createResponseFileInput(String printDocUrl, HttpServletResponse response) { if (response == null) { - return null; -// return uploadCertificate(printDocUrl); +// return null; + return uploadCertificate(printDocUrl); } File file = new File(printDocUrl); InputStream in = null;