|
|
@@ -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.dynamictbins.vo.CreateInstantiateWithRuleVO;
|
|
|
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.TaskOrderNonTaxRecordRespVO;
|
|
|
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.orderreport.OrderReportDO;
|
|
|
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.mysql.boilerconnecttbservice.BoilerConnectTbServiceMapper;
|
|
|
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.pdf.PdfService;
|
|
|
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.util.JwApiClient;
|
|
|
import cn.start.tz.module.pressure2.util.vo.ApiResponse;
|
|
|
@@ -302,6 +305,9 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
@Resource
|
|
|
private FileApi fileApi;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private TaskOrderFileService taskOrderFileService;
|
|
|
+
|
|
|
@Resource
|
|
|
private PushTaskOrderService pushTaskOrderService;
|
|
|
|
|
|
@@ -476,7 +482,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
param.setMemberId(memberUser.getId());
|
|
|
if (EnvEnum.LOCAL.getEnvName().equals(env)){
|
|
|
param.setTemplateId("y_D6jCp4MuYMABo5O0mTrREGmI6rip0Feke-r9PkV_g");
|
|
|
- } else if (EnvEnum.UAT.getEnvName().equals(env)) {
|
|
|
+ } else if (EnvEnum.PROD.getEnvName().equals(env)) {
|
|
|
param.setTemplateId("fTvRP72t6_8xZZ1u8F0PhYOUHUVreor7aCD3qIF596Y");
|
|
|
}
|
|
|
List<WxMpTemplateDataReqDto> list1 = new ArrayList<>();
|
|
|
@@ -548,7 +554,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
param.setMemberId(memberUser.getId());
|
|
|
if (EnvEnum.LOCAL.getEnvName().equals(env)){
|
|
|
param.setTemplateId("y_D6jCp4MuYMABo5O0mTrREGmI6rip0Feke-r9PkV_g");
|
|
|
- } else if (EnvEnum.UAT.getEnvName().equals(env)) {
|
|
|
+ } else if (EnvEnum.PROD.getEnvName().equals(env)) {
|
|
|
param.setTemplateId("fTvRP72t6_8xZZ1u8F0PhYOUHUVreor7aCD3qIF596Y");
|
|
|
}
|
|
|
List<SendMpMessageReqVO.TemplateData> list1 = new ArrayList<>();
|
|
|
@@ -768,7 +774,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
//TODO 标志
|
|
|
ByteArrayOutputStream outputStream = getUseLogoOutputStream(taskOrderItemDO.getId(), 100);
|
|
|
useLogoUrl = fileApi.createFile(outputStream.toByteArray());
|
|
|
- if (Objects.equals(env, "uat")) {
|
|
|
+ if (Objects.equals(env, "prod")) {
|
|
|
useLogoUrl = minioHostouter + useLogoUrl;
|
|
|
} else {
|
|
|
useLogoUrl = minioHost + useLogoUrl;
|
|
|
@@ -832,7 +838,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
param.setMemberId(finalMemberUser.getId());
|
|
|
if (EnvEnum.LOCAL.getEnvName().equals(env)){
|
|
|
param.setTemplateId("y_D6jCp4MuYMABo5O0mTrREGmI6rip0Feke-r9PkV_g");
|
|
|
- } else if (EnvEnum.UAT.getEnvName().equals(env)) {
|
|
|
+ } else if (EnvEnum.PROD.getEnvName().equals(env)) {
|
|
|
param.setTemplateId("fTvRP72t6_8xZZ1u8F0PhYOUHUVreor7aCD3qIF596Y");
|
|
|
}
|
|
|
List<WxMpTemplateDataReqDto> list = new ArrayList<>();
|
|
|
@@ -895,7 +901,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
}
|
|
|
});
|
|
|
// 推送结算系统
|
|
|
- if (env.equals("uat")){
|
|
|
+ if (env.equals("prod")){
|
|
|
pushTaskOrderService.pushFinanceSystem(taskOrderDO);
|
|
|
}
|
|
|
}
|
|
|
@@ -1060,7 +1066,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
taskOrderItemDO.getIssueUrl().toLowerCase().startsWith("https://")) {
|
|
|
issuePdfUrl = taskOrderItemDO.getIssueUrl();
|
|
|
} else {
|
|
|
- if (Objects.equals(env, "uat")) {
|
|
|
+ if (Objects.equals(env, "prod")) {
|
|
|
issuePdfUrl = minioHostouter + taskOrderItemDO.getIssueUrl();
|
|
|
} else {
|
|
|
issuePdfUrl = minioHost + taskOrderItemDO.getIssueUrl();
|
|
|
@@ -1141,7 +1147,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
taskOrderItemDO.getUseLogo().toLowerCase().startsWith("https://")) {
|
|
|
useLogoPdfUrl = taskOrderItemDO.getUseLogo();
|
|
|
} else {
|
|
|
- if (Objects.equals(env, "uat")) {
|
|
|
+ if (Objects.equals(env, "prod")) {
|
|
|
useLogoPdfUrl = minioHostouter + taskOrderItemDO.getUseLogo();
|
|
|
} else {
|
|
|
useLogoPdfUrl = minioHost + taskOrderItemDO.getUseLogo();
|
|
|
@@ -1281,7 +1287,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
}
|
|
|
|
|
|
// 根据环境返回完整的 URL
|
|
|
- if (Objects.equals(env, "uat")) {
|
|
|
+ if (Objects.equals(env, "prod")) {
|
|
|
return minioHostouter + useLogo;
|
|
|
} else {
|
|
|
return minioHost + useLogo;
|
|
|
@@ -1491,7 +1497,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
param.setMemberId(finalMemberUser.getId());
|
|
|
if (EnvEnum.LOCAL.getEnvName().equals(env)) {
|
|
|
param.setTemplateId("y_D6jCp4MuYMABo5O0mTrREGmI6rip0Feke-r9PkV_g");
|
|
|
- } else if (EnvEnum.UAT.getEnvName().equals(env)) {
|
|
|
+ } else if (EnvEnum.PROD.getEnvName().equals(env)) {
|
|
|
param.setTemplateId("fTvRP72t6_8xZZ1u8F0PhYOUHUVreor7aCD3qIF596Y");
|
|
|
}
|
|
|
List<WxMpTemplateDataReqDto> list = new ArrayList<>();
|
|
|
@@ -1553,7 +1559,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
});
|
|
|
}
|
|
|
// 推送结算系统
|
|
|
- if (env.equals("uat")){
|
|
|
+ if (env.equals("prod")){
|
|
|
pushTaskOrderService.pushFinanceSystem(taskOrderDO);
|
|
|
}
|
|
|
|
|
|
@@ -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;
|
|
|
}
|
|
|
|
|
|
@@ -2812,7 +2836,7 @@ public class BoilerTaskOrderIssueReportServiceImpl extends ServiceImpl<BoilerTas
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (EnvEnum.UAT.getEnvName().equals(env)) {
|
|
|
+ if (EnvEnum.PROD.getEnvName().equals(env)) {
|
|
|
reportUrl = minioHostouter + fileUrl;
|
|
|
} else {
|
|
|
reportUrl = minioHost + fileUrl;
|