|
@@ -38,6 +38,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskordersignfile.vo.
|
|
|
import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespVO;
|
|
import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespVO;
|
|
|
import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
|
|
import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
|
|
|
import cn.start.tz.module.pressure2.controller.admin.pipetaskorderinput.vo.PipeTaskOrderInputPrintReqVO;
|
|
import cn.start.tz.module.pressure2.controller.admin.pipetaskorderinput.vo.PipeTaskOrderInputPrintReqVO;
|
|
|
|
|
+import cn.start.tz.module.pressure2.controller.admin.taskorderfile.vo.TaskOrderFilePageReqVO;
|
|
|
import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordPageReqVO;
|
|
import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordPageReqVO;
|
|
|
import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordRespVO;
|
|
import cn.start.tz.module.pressure2.controller.admin.taskordernontaxrecord.vo.TaskOrderNonTaxRecordRespVO;
|
|
|
import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
|
|
import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderIssueReportItemRespVO;
|
|
@@ -59,6 +60,7 @@ import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
|
|
|
import cn.start.tz.module.pressure2.dal.dataobject.notificationformreport.NotificationformReportDO;
|
|
import cn.start.tz.module.pressure2.dal.dataobject.notificationformreport.NotificationformReportDO;
|
|
|
import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
|
|
import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
|
|
|
import cn.start.tz.module.pressure2.dal.dataobject.reporttemplate.ReportTemplateDO;
|
|
import cn.start.tz.module.pressure2.dal.dataobject.reporttemplate.ReportTemplateDO;
|
|
|
|
|
+import cn.start.tz.module.pressure2.dal.dataobject.taskorderfile.TaskOrderFileDO;
|
|
|
import cn.start.tz.module.pressure2.dal.dataobject.usesignreport.UseSignReportDO;
|
|
import cn.start.tz.module.pressure2.dal.dataobject.usesignreport.UseSignReportDO;
|
|
|
import cn.start.tz.module.pressure2.dal.mysql.boilerconnecttbservice.BoilerConnectTbServiceMapper;
|
|
import cn.start.tz.module.pressure2.dal.mysql.boilerconnecttbservice.BoilerConnectTbServiceMapper;
|
|
|
import cn.start.tz.module.pressure2.dal.mysql.boilerelectronicreportauditrecord.BoilerElectronicReportAuditRecordMapper;
|
|
import cn.start.tz.module.pressure2.dal.mysql.boilerelectronicreportauditrecord.BoilerElectronicReportAuditRecordMapper;
|
|
@@ -93,6 +95,7 @@ import cn.start.tz.module.pressure2.service.membermessage.MemberMessageRemoteSer
|
|
|
import cn.start.tz.module.pressure2.service.membermessage.vo.SendMpMessageReqVO;
|
|
import cn.start.tz.module.pressure2.service.membermessage.vo.SendMpMessageReqVO;
|
|
|
import cn.start.tz.module.pressure2.service.pdf.PdfService;
|
|
import cn.start.tz.module.pressure2.service.pdf.PdfService;
|
|
|
import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
|
|
import cn.start.tz.module.pressure2.service.pushtaskorder.PushTaskOrderService;
|
|
|
|
|
+import cn.start.tz.module.pressure2.service.taskorderfile.TaskOrderFileService;
|
|
|
import cn.start.tz.module.pressure2.service.taskordernontaxrecord.TaskOrderNonTaxRecordService;
|
|
import cn.start.tz.module.pressure2.service.taskordernontaxrecord.TaskOrderNonTaxRecordService;
|
|
|
import cn.start.tz.module.pressure2.util.JwApiClient;
|
|
import cn.start.tz.module.pressure2.util.JwApiClient;
|
|
|
import cn.start.tz.module.pressure2.util.vo.ApiResponse;
|
|
import cn.start.tz.module.pressure2.util.vo.ApiResponse;
|
|
@@ -302,6 +305,9 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
@Resource
|
|
@Resource
|
|
|
private FileApi fileApi;
|
|
private FileApi fileApi;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private TaskOrderFileService taskOrderFileService;
|
|
|
|
|
+
|
|
|
@Resource
|
|
@Resource
|
|
|
private PushTaskOrderService pushTaskOrderService;
|
|
private PushTaskOrderService pushTaskOrderService;
|
|
|
|
|
|
|
@@ -2508,6 +2514,24 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ // 查询附件文件
|
|
|
|
|
+ TaskOrderFilePageReqVO filePageReqVO = new TaskOrderFilePageReqVO();
|
|
|
|
|
+ filePageReqVO.setOrderItemId(orderItemId);
|
|
|
|
|
+ filePageReqVO.setPageSize(Integer.MAX_VALUE);
|
|
|
|
|
+ PageResult<TaskOrderFileDO> filePageResult =
|
|
|
|
|
+ taskOrderFileService.getTaskOrderFilePage(filePageReqVO);
|
|
|
|
|
+ if (CollUtil.isNotEmpty(filePageResult.getList())) {
|
|
|
|
|
+ List<BoilerTaskOrderArchiveDetailRespVO.AttachmentFile> attachmentFiles = new ArrayList<>();
|
|
|
|
|
+ for (TaskOrderFileDO fileDO : filePageResult.getList()) {
|
|
|
|
|
+ BoilerTaskOrderArchiveDetailRespVO.AttachmentFile attachmentFile = new BoilerTaskOrderArchiveDetailRespVO.AttachmentFile();
|
|
|
|
|
+ attachmentFile.setId(fileDO.getId());
|
|
|
|
|
+ attachmentFile.setFileName(fileDO.getFileName());
|
|
|
|
|
+ attachmentFile.setFileUrl(fileDO.getFileUrl());
|
|
|
|
|
+ attachmentFile.setCreateTime(fileDO.getCreateTime());
|
|
|
|
|
+ attachmentFiles.add(attachmentFile);
|
|
|
|
|
+ }
|
|
|
|
|
+ taskOrderArchiveDetail.setAttachmentFiles(attachmentFiles);
|
|
|
|
|
+ }
|
|
|
return taskOrderArchiveDetail;
|
|
return taskOrderArchiveDetail;
|
|
|
}
|
|
}
|
|
|
|
|
|