diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java index 3240574..d62ff90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java @@ -54,7 +54,7 @@ @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { fileRecallArchiveService.exportFile(exportDTO,response); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java index 3240574..d62ff90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java @@ -54,7 +54,7 @@ @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { fileRecallArchiveService.exportFile(exportDTO,response); } } 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 c44c1cd..45cb646 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 @@ -98,6 +98,7 @@ String RESOURCE_SUPPLIER_ABANDON_GOODS_HANDLE = "废弃物资处理交接记录"; String RESOURCE_ENVIRONMENT_REQUIRE = "工作间环境条件要求一览表"; + String RESOURCE_FILE_RECALL_ARCHIVE = "文件作废登记表"; /** diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java index 3240574..d62ff90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java @@ -54,7 +54,7 @@ @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { fileRecallArchiveService.exportFile(exportDTO,response); } } 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 c44c1cd..45cb646 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 @@ -98,6 +98,7 @@ String RESOURCE_SUPPLIER_ABANDON_GOODS_HANDLE = "废弃物资处理交接记录"; String RESOURCE_ENVIRONMENT_REQUIRE = "工作间环境条件要求一览表"; + String RESOURCE_FILE_RECALL_ARCHIVE = "文件作废登记表"; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index 6f56b80..b8cedd8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -23,6 +23,7 @@ import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileChangeFileService; import com.casic.missiles.service.resource.IBizResourceFileChangeService; +import com.casic.missiles.service.resource.IBizResourceSystemFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +50,8 @@ @Autowired private IBizResourceFileChangeFileService changeFileService; @Autowired + private IBizResourceSystemFileService systemFileService; + @Autowired private PrintFileRegister printFileRegister; @Override diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java index 3240574..d62ff90 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/BizResourceFileRecallArchiveController.java @@ -54,7 +54,7 @@ @ApiOperation("导出word/pdf/打印") @PostMapping("/exportFile") - public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response){ + public void exportFile(@RequestBody @Valid ExportDTO exportDTO, HttpServletResponse response) throws Exception { fileRecallArchiveService.exportFile(exportDTO,response); } } 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 c44c1cd..45cb646 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 @@ -98,6 +98,7 @@ String RESOURCE_SUPPLIER_ABANDON_GOODS_HANDLE = "废弃物资处理交接记录"; String RESOURCE_ENVIRONMENT_REQUIRE = "工作间环境条件要求一览表"; + String RESOURCE_FILE_RECALL_ARCHIVE = "文件作废登记表"; /** diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java index 6f56b80..b8cedd8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileChangeServiceImpl.java @@ -23,6 +23,7 @@ import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileChangeFileService; import com.casic.missiles.service.resource.IBizResourceFileChangeService; +import com.casic.missiles.service.resource.IBizResourceSystemFileService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NoGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +50,8 @@ @Autowired private IBizResourceFileChangeFileService changeFileService; @Autowired + private IBizResourceSystemFileService systemFileService; + @Autowired private PrintFileRegister printFileRegister; @Override diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java index 12f73bb..1546f0b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/resource/BizResourceFileRecallArchiveServiceImpl.java @@ -1,6 +1,8 @@ package com.casic.missiles.service.Impl.resource; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.core.shiro.ShiroKit; @@ -13,12 +15,16 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.NoGenerateFileCodeEnum; import com.casic.missiles.enums.NoGenerateRecordTypeCodeEnum; +import com.casic.missiles.enums.PrintFileModuleNameEnum; import com.casic.missiles.enums.system.ApprovalStatusEnum; +import com.casic.missiles.enums.system.FilePrintEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.resource.BizResourceFileRecallArchiveMapper; import com.casic.missiles.model.resource.BizResourceFileRecallArchive; import com.casic.missiles.model.resource.BizResourceFileRecallArchiveFile; import com.casic.missiles.service.Impl.GeneralApprovalServiceImpl; +import com.casic.missiles.service.flowable.ApprovalOperateService; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveFileService; import com.casic.missiles.service.resource.IBizResourceFileRecallArchiveService; import com.casic.missiles.utils.DictCodeUtils; @@ -29,8 +35,11 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; import java.util.Objects; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.*; + /** *
* 资源管理-文件管理-文件收回存档登记表 服务实现类
@@ -43,6 +52,9 @@
public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl
* 资源管理-文件管理-文件收回存档登记表 服务实现类
@@ -43,6 +52,9 @@
public class BizResourceFileRecallArchiveServiceImpl extends GeneralApprovalServiceImpl