diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index a8ca3e0..9cadecc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -119,11 +119,14 @@ @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { //to-do 所有文件压缩包导出 + } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualityPreventRecordService.exportFile(exportDTO,response); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index a8ca3e0..9cadecc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -119,11 +119,14 @@ @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { //to-do 所有文件压缩包导出 + } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualityPreventRecordService.exportFile(exportDTO,response); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index 7b4c9ba..682785e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -164,5 +164,6 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualitySupervisionRecordService.exportFile(exportDTO,response); } } \ No newline at end of file diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index a8ca3e0..9cadecc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -119,11 +119,14 @@ @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { //to-do 所有文件压缩包导出 + } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualityPreventRecordService.exportFile(exportDTO,response); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index 7b4c9ba..682785e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -164,5 +164,6 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualitySupervisionRecordService.exportFile(exportDTO,response); } } \ No newline at end of file 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 2a8ec31..53fcb7f 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 @@ -34,6 +34,17 @@ String GOODS_WAREHOUSE = "物资入库单"; + /** + * 质量监督活动 + */ + String QUALITY_SUPERVISION_RECORD = "质量监督记录"; + /** + * 质量监督报告 + */ + String QUALITY_SUPERVISION_REPORT = "质量监督报告"; + + + String EXPORT_TEMPLATE = "导出模板"; /** * 设备履历管理模块 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index a8ca3e0..9cadecc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -119,11 +119,14 @@ @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { //to-do 所有文件压缩包导出 + } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualityPreventRecordService.exportFile(exportDTO,response); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index 7b4c9ba..682785e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -164,5 +164,6 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualitySupervisionRecordService.exportFile(exportDTO,response); } } \ No newline at end of file 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 2a8ec31..53fcb7f 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 @@ -34,6 +34,17 @@ String GOODS_WAREHOUSE = "物资入库单"; + /** + * 质量监督活动 + */ + String QUALITY_SUPERVISION_RECORD = "质量监督记录"; + /** + * 质量监督报告 + */ + String QUALITY_SUPERVISION_REPORT = "质量监督报告"; + + + String EXPORT_TEMPLATE = "导出模板"; /** * 设备履历管理模块 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 814b59b..43559d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; 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.quality.BizQualityPreventRecordVO; @@ -31,6 +32,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -274,6 +277,11 @@ return auditList.stream().distinct().collect(Collectors.toList()); } + @Override + public void exportFile(@Valid ExportDTO exportDTO, HttpServletResponse response) { + + } + private List getBizQualityPreventRecordList(QualityCorrectiveFileTypeEnum enums, String yearNo) { QueryWrapper query = new QueryWrapper<>(); //检索内部审核检查表 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index a8ca3e0..9cadecc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -119,11 +119,14 @@ @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { //to-do 所有文件压缩包导出 + } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualityPreventRecordService.exportFile(exportDTO,response); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index 7b4c9ba..682785e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -164,5 +164,6 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualitySupervisionRecordService.exportFile(exportDTO,response); } } \ No newline at end of file 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 2a8ec31..53fcb7f 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 @@ -34,6 +34,17 @@ String GOODS_WAREHOUSE = "物资入库单"; + /** + * 质量监督活动 + */ + String QUALITY_SUPERVISION_RECORD = "质量监督记录"; + /** + * 质量监督报告 + */ + String QUALITY_SUPERVISION_REPORT = "质量监督报告"; + + + String EXPORT_TEMPLATE = "导出模板"; /** * 设备履历管理模块 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 814b59b..43559d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; 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.quality.BizQualityPreventRecordVO; @@ -31,6 +32,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -274,6 +277,11 @@ return auditList.stream().distinct().collect(Collectors.toList()); } + @Override + public void exportFile(@Valid ExportDTO exportDTO, HttpServletResponse response) { + + } + private List getBizQualityPreventRecordList(QualityCorrectiveFileTypeEnum enums, String yearNo) { QueryWrapper query = new QueryWrapper<>(); //检索内部审核检查表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java index 7f8c4d7..86602bc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -1,23 +1,34 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.bean.BeanUtil; 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.constants.MeterDictCode; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.quality.CorrectiveDTO; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; import com.casic.missiles.model.quality.*; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; /** @@ -29,12 +40,14 @@ * @date 2023-10-21 */ @Service +@RequiredArgsConstructor public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService, IBaseFileCodeService { private final IBizLabRelDeptService relDeptService; private final AbstractPermissionContext permissionContext; private final IBizQualityProcessRecordService bizQualityProcessRecordService; private final IBizQualityRepRelService bizQualityRepRelService; private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + private final PrintFileRegister printFileRegister; /** * 预防措施处理单 @@ -46,17 +59,6 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; - public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext, IBizQualityProcessRecordService bizQualityProcessRecordService, IBizQualityRepRelService bizQualityRepRelService, IBizQualityNonConformanceRepService bizQualityNonConformanceRepService, IBizQualityPreventRecordService bizQualityPreventRecordService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { - this.relDeptService = relDeptService; - this.permissionContext = permissionContext; - this.bizQualityProcessRecordService = bizQualityProcessRecordService; - this.bizQualityRepRelService = bizQualityRepRelService; - this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; - this.bizQualityPreventRecordService = bizQualityPreventRecordService; - this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; - this.dictService = dictService; - } - @Override public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { List records = this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); @@ -120,6 +122,15 @@ return record; } + @Override + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + BizQualitySupervisionRecord record = super.getById(exportDTO.getId()); + if (Objects.nonNull(record)) { + Map map = BeanUtil.beanToMap(record); + printFileRegister.registerPrintFile(FILE_GRANT_NOTICE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + @Transactional @Override public boolean updateById(BizQualitySupervisionRecord entity) { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index a8ca3e0..9cadecc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -119,11 +119,14 @@ @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { //to-do 所有文件压缩包导出 + } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualityPreventRecordService.exportFile(exportDTO,response); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index 7b4c9ba..682785e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -164,5 +164,6 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualitySupervisionRecordService.exportFile(exportDTO,response); } } \ No newline at end of file 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 2a8ec31..53fcb7f 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 @@ -34,6 +34,17 @@ String GOODS_WAREHOUSE = "物资入库单"; + /** + * 质量监督活动 + */ + String QUALITY_SUPERVISION_RECORD = "质量监督记录"; + /** + * 质量监督报告 + */ + String QUALITY_SUPERVISION_REPORT = "质量监督报告"; + + + String EXPORT_TEMPLATE = "导出模板"; /** * 设备履历管理模块 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 814b59b..43559d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; 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.quality.BizQualityPreventRecordVO; @@ -31,6 +32,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -274,6 +277,11 @@ return auditList.stream().distinct().collect(Collectors.toList()); } + @Override + public void exportFile(@Valid ExportDTO exportDTO, HttpServletResponse response) { + + } + private List getBizQualityPreventRecordList(QualityCorrectiveFileTypeEnum enums, String yearNo) { QueryWrapper query = new QueryWrapper<>(); //检索内部审核检查表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java index 7f8c4d7..86602bc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -1,23 +1,34 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.bean.BeanUtil; 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.constants.MeterDictCode; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.quality.CorrectiveDTO; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; import com.casic.missiles.model.quality.*; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; /** @@ -29,12 +40,14 @@ * @date 2023-10-21 */ @Service +@RequiredArgsConstructor public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService, IBaseFileCodeService { private final IBizLabRelDeptService relDeptService; private final AbstractPermissionContext permissionContext; private final IBizQualityProcessRecordService bizQualityProcessRecordService; private final IBizQualityRepRelService bizQualityRepRelService; private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + private final PrintFileRegister printFileRegister; /** * 预防措施处理单 @@ -46,17 +59,6 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; - public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext, IBizQualityProcessRecordService bizQualityProcessRecordService, IBizQualityRepRelService bizQualityRepRelService, IBizQualityNonConformanceRepService bizQualityNonConformanceRepService, IBizQualityPreventRecordService bizQualityPreventRecordService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { - this.relDeptService = relDeptService; - this.permissionContext = permissionContext; - this.bizQualityProcessRecordService = bizQualityProcessRecordService; - this.bizQualityRepRelService = bizQualityRepRelService; - this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; - this.bizQualityPreventRecordService = bizQualityPreventRecordService; - this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; - this.dictService = dictService; - } - @Override public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { List records = this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); @@ -120,6 +122,15 @@ return record; } + @Override + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + BizQualitySupervisionRecord record = super.getById(exportDTO.getId()); + if (Objects.nonNull(record)) { + Map map = BeanUtil.beanToMap(record); + printFileRegister.registerPrintFile(FILE_GRANT_NOTICE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + @Transactional @Override public boolean updateById(BizQualitySupervisionRecord entity) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index d9f3282..75efc18 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -51,6 +51,7 @@ Page downloadListResponsePage = PageFactory.defaultPage(); Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(downloadCenterPage.getRecords(), DownloadListResponse.class)); + downloadListResponsePage.setTotal(downloadCenterPage.getTotal()); for (DownloadListResponse customerInfo : downloadListResponsePage.getRecords()) { DictCodeUtils.convertDictCodeToName(customerInfo); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index a8ca3e0..9cadecc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -119,11 +119,14 @@ @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { //to-do 所有文件压缩包导出 + } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualityPreventRecordService.exportFile(exportDTO,response); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index 7b4c9ba..682785e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -164,5 +164,6 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualitySupervisionRecordService.exportFile(exportDTO,response); } } \ No newline at end of file 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 2a8ec31..53fcb7f 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 @@ -34,6 +34,17 @@ String GOODS_WAREHOUSE = "物资入库单"; + /** + * 质量监督活动 + */ + String QUALITY_SUPERVISION_RECORD = "质量监督记录"; + /** + * 质量监督报告 + */ + String QUALITY_SUPERVISION_REPORT = "质量监督报告"; + + + String EXPORT_TEMPLATE = "导出模板"; /** * 设备履历管理模块 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 814b59b..43559d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; 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.quality.BizQualityPreventRecordVO; @@ -31,6 +32,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -274,6 +277,11 @@ return auditList.stream().distinct().collect(Collectors.toList()); } + @Override + public void exportFile(@Valid ExportDTO exportDTO, HttpServletResponse response) { + + } + private List getBizQualityPreventRecordList(QualityCorrectiveFileTypeEnum enums, String yearNo) { QueryWrapper query = new QueryWrapper<>(); //检索内部审核检查表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java index 7f8c4d7..86602bc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -1,23 +1,34 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.bean.BeanUtil; 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.constants.MeterDictCode; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.quality.CorrectiveDTO; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; import com.casic.missiles.model.quality.*; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; /** @@ -29,12 +40,14 @@ * @date 2023-10-21 */ @Service +@RequiredArgsConstructor public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService, IBaseFileCodeService { private final IBizLabRelDeptService relDeptService; private final AbstractPermissionContext permissionContext; private final IBizQualityProcessRecordService bizQualityProcessRecordService; private final IBizQualityRepRelService bizQualityRepRelService; private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + private final PrintFileRegister printFileRegister; /** * 预防措施处理单 @@ -46,17 +59,6 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; - public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext, IBizQualityProcessRecordService bizQualityProcessRecordService, IBizQualityRepRelService bizQualityRepRelService, IBizQualityNonConformanceRepService bizQualityNonConformanceRepService, IBizQualityPreventRecordService bizQualityPreventRecordService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { - this.relDeptService = relDeptService; - this.permissionContext = permissionContext; - this.bizQualityProcessRecordService = bizQualityProcessRecordService; - this.bizQualityRepRelService = bizQualityRepRelService; - this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; - this.bizQualityPreventRecordService = bizQualityPreventRecordService; - this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; - this.dictService = dictService; - } - @Override public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { List records = this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); @@ -120,6 +122,15 @@ return record; } + @Override + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + BizQualitySupervisionRecord record = super.getById(exportDTO.getId()); + if (Objects.nonNull(record)) { + Map map = BeanUtil.beanToMap(record); + printFileRegister.registerPrintFile(FILE_GRANT_NOTICE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + @Transactional @Override public boolean updateById(BizQualitySupervisionRecord entity) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index d9f3282..75efc18 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -51,6 +51,7 @@ Page downloadListResponsePage = PageFactory.defaultPage(); Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(downloadCenterPage.getRecords(), DownloadListResponse.class)); + downloadListResponsePage.setTotal(downloadCenterPage.getTotal()); for (DownloadListResponse customerInfo : downloadListResponsePage.getRecords()) { DictCodeUtils.convertDictCodeToName(customerInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java index 81daadd..ebe8844 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; @@ -12,7 +13,10 @@ import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.base.IQualityGeneralApprovalService; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.List; @@ -52,4 +56,10 @@ * @return */ List listByInternalAuditRepId(Long repId); + + /** + * pdf或者word进行打印 + * @param exportDTO + */ + void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java index a8ca3e0..9cadecc 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityPreventRecordController.java @@ -119,11 +119,14 @@ @PostMapping("/listExport") public void export(@RequestBody OutsourceAssessApprovalListRequest request) throws Exception { //to-do 所有文件压缩包导出 + } @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualityPreventRecordService.exportFile(exportDTO,response); } + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java index 7b4c9ba..682785e 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualitySupervisionRecordController.java @@ -164,5 +164,6 @@ @PostMapping("/exportFile") public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { //to-do pdf导出 + bizQualitySupervisionRecordService.exportFile(exportDTO,response); } } \ No newline at end of file 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 2a8ec31..53fcb7f 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 @@ -34,6 +34,17 @@ String GOODS_WAREHOUSE = "物资入库单"; + /** + * 质量监督活动 + */ + String QUALITY_SUPERVISION_RECORD = "质量监督记录"; + /** + * 质量监督报告 + */ + String QUALITY_SUPERVISION_REPORT = "质量监督报告"; + + + String EXPORT_TEMPLATE = "导出模板"; /** * 设备履历管理模块 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java index 814b59b..43559d3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualityPreventRecordServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.model.auth.AuthUser; 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.quality.BizQualityPreventRecordVO; @@ -31,6 +32,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -274,6 +277,11 @@ return auditList.stream().distinct().collect(Collectors.toList()); } + @Override + public void exportFile(@Valid ExportDTO exportDTO, HttpServletResponse response) { + + } + private List getBizQualityPreventRecordList(QualityCorrectiveFileTypeEnum enums, String yearNo) { QueryWrapper query = new QueryWrapper<>(); //检索内部审核检查表 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java index 7f8c4d7..86602bc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/quality/BizQualitySupervisionRecordServiceImpl.java @@ -1,23 +1,34 @@ package com.casic.missiles.service.Impl.quality; +import cn.hutool.core.bean.BeanUtil; 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.constants.MeterDictCode; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.application.service.AbstractDictService; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.quality.CorrectiveDTO; import com.casic.missiles.enums.quality.QualityTableEnum; import com.casic.missiles.mapper.quality.BizQualitySupervisionRecordMapper; import com.casic.missiles.model.quality.*; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.quality.*; import com.casic.missiles.service.quality.base.IBaseFileCodeService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.Serializable; import java.util.List; +import java.util.Map; +import java.util.Objects; + +import static com.casic.missiles.enums.PrintFileModuleNameEnum.FILE_GRANT_NOTICE_FORM; /** @@ -29,12 +40,14 @@ * @date 2023-10-21 */ @Service +@RequiredArgsConstructor public class BizQualitySupervisionRecordServiceImpl extends ServiceImpl implements IBizQualitySupervisionRecordService, IBaseFileCodeService { private final IBizLabRelDeptService relDeptService; private final AbstractPermissionContext permissionContext; private final IBizQualityProcessRecordService bizQualityProcessRecordService; private final IBizQualityRepRelService bizQualityRepRelService; private final IBizQualityNonConformanceRepService bizQualityNonConformanceRepService; + private final PrintFileRegister printFileRegister; /** * 预防措施处理单 @@ -46,17 +59,6 @@ private final IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService; private final AbstractDictService dictService; - public BizQualitySupervisionRecordServiceImpl(IBizLabRelDeptService relDeptService, AbstractPermissionContext permissionContext, IBizQualityProcessRecordService bizQualityProcessRecordService, IBizQualityRepRelService bizQualityRepRelService, IBizQualityNonConformanceRepService bizQualityNonConformanceRepService, IBizQualityPreventRecordService bizQualityPreventRecordService, IBizQualityCorrectiveRecordService bizQualityCorrectiveRecordService, AbstractDictService dictService) { - this.relDeptService = relDeptService; - this.permissionContext = permissionContext; - this.bizQualityProcessRecordService = bizQualityProcessRecordService; - this.bizQualityRepRelService = bizQualityRepRelService; - this.bizQualityNonConformanceRepService = bizQualityNonConformanceRepService; - this.bizQualityPreventRecordService = bizQualityPreventRecordService; - this.bizQualityCorrectiveRecordService = bizQualityCorrectiveRecordService; - this.dictService = dictService; - } - @Override public List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page) { List records = this.baseMapper.selectBizQualitySupervisionRecordPage(query, page); @@ -120,6 +122,15 @@ return record; } + @Override + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) { + BizQualitySupervisionRecord record = super.getById(exportDTO.getId()); + if (Objects.nonNull(record)) { + Map map = BeanUtil.beanToMap(record); + printFileRegister.registerPrintFile(FILE_GRANT_NOTICE_FORM, "1", null, map, exportDTO.isPdf(), response); + } + } + @Transactional @Override public boolean updateById(BizQualitySupervisionRecord entity) { diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java index d9f3282..75efc18 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/DownloadCenterServiceImpl.java @@ -51,6 +51,7 @@ Page downloadListResponsePage = PageFactory.defaultPage(); Page downloadCenterPage = this.baseMapper.selectPage(page, queryWrapper); downloadListResponsePage.setRecords(ConvertUtils.sourceToTarget(downloadCenterPage.getRecords(), DownloadListResponse.class)); + downloadListResponsePage.setTotal(downloadCenterPage.getTotal()); for (DownloadListResponse customerInfo : downloadListResponsePage.getRecords()) { DictCodeUtils.convertDictCodeToName(customerInfo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java index 81daadd..ebe8844 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualityPreventRecordService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.BaseApprovalSubmitRequest; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.quality.BizQualityPreventRecordVO; import com.casic.missiles.dto.quality.BizQualitySupervisionRepVO; import com.casic.missiles.dto.quality.approval.BizQualityPreventApprovalVO; @@ -12,7 +13,10 @@ import com.casic.missiles.model.quality.BizQualitySupervisionRep; import com.casic.missiles.service.IGeneralApprovalService; import com.casic.missiles.service.quality.base.IQualityGeneralApprovalService; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.List; @@ -52,4 +56,10 @@ * @return */ List listByInternalAuditRepId(Long repId); + + /** + * pdf或者word进行打印 + * @param exportDTO + */ + void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java index cde3200..1254f15 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/IBizQualitySupervisionRecordService.java @@ -3,9 +3,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.model.quality.BizLabRelDept; import com.casic.missiles.model.quality.BizQualitySupervisionRecord; +import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.util.List; @@ -24,7 +28,6 @@ List selectBizQualitySupervisionRecordPage(QueryWrapper query, Page page); - /** * 关联组织查询 * @@ -40,4 +43,6 @@ * @return */ BizQualitySupervisionRecord getByIdNoNonConformanceRep(Long superRecordId); + + void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response); }