意见通知书

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderService.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.service.boilertaskorder;
 
 import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.module.infra.api.sign.dto.SignValuesDTO;
 import cn.start.tz.module.pressure.api.taskorder.dto.NonTaxPayStatusDTO;
 import cn.start.tz.module.pressure2.api.taskorder.dto.UpdatePayStatusDTO;
 import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespVO;
@@ -272,4 +273,5 @@ public interface BoilerTaskOrderService extends IService<BoilerTaskOrderDO>  {
 
     byte[] getRecordOutputStreamMerge(String orderItemId);
 
+    byte[] sign(byte[] bytes, List<SignValuesDTO> valuesDTOList) throws Exception;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -44,7 +44,6 @@ import cn.start.tz.module.pressure2.controller.appapi.boilertaskorder.vo.BoilerO
 import cn.start.tz.module.pressure2.dal.dataobject.businessmemberrelation.BusinessMemberRelationDO;
 import cn.start.tz.module.pressure2.dal.dataobject.notificationformreport.NotificationformReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.opinionnotificationfollowrecord.OpinionNotificationFollowRecordDO;
-import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderuser.PipeTaskOrderUserDO;
@@ -8341,7 +8340,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
         return signApi.getSignFile(signUrl).getCheckedData();
     }
-    private byte[] sign(byte[] bytes, List<SignValuesDTO> valuesDTOList) throws Exception {
+    @Override
+    public byte[] sign(byte[] bytes, List<SignValuesDTO> valuesDTOList) throws Exception {
         CntSignReqDTO signReqDTO = new CntSignReqDTO();
         signReqDTO.setBytes(bytes);
         signReqDTO.setValuesDTOList(valuesDTOList);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerAppTaskOrderItemReportServiceImpl.java

@@ -7,6 +7,8 @@ import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.framework.security.core.util.SecurityFrameworkUtils;
 import cn.start.tz.framework.security.core.LoginUser;
+import cn.start.tz.module.infra.api.file.FileApi;
+import cn.start.tz.module.infra.api.sign.dto.SignValuesDTO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerOrderItemPageRespVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderSyncReportVO;
@@ -26,7 +28,9 @@ import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
 import cn.start.tz.module.pressure2.framework.appauth.core.context.AppAuthContextHolder;
 import cn.start.tz.module.pressure2.service.boilertaskorder.BoilerTaskOrderService;
 import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
+import cn.start.tz.module.pressure2.service.pdf.PdfService;
 import com.alibaba.fastjson2.JSONObject;
+import com.google.common.collect.Lists;
 import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -34,8 +38,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.io.ByteArrayOutputStream;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
@@ -77,6 +83,16 @@ public class BoilerAppTaskOrderItemReportServiceImpl implements BoilerAppTaskOrd
     @Resource
     private RedissonClient redissonClient;
 
+
+    @Value("${tz.env.name}")
+    private String env;
+
+    @Resource
+    private PdfService pdfService;
+
+    @Resource
+    private FileApi fileApi;
+
     @Override
     public PageResult<BoilerOrderItemPageRespVO> appInspectionOpinionPage(BoilerTaskOrderPageReqVO pageReqVO) {
         // 不传单位code时根据当前登录人memberId查询
@@ -148,6 +164,53 @@ public class BoilerAppTaskOrderItemReportServiceImpl implements BoilerAppTaskOrd
                 syncReportVO.setRefId(reportDO.getId());
                 syncReportVO.setReportType("record");
                 boilerTaskOrderService.syncReportData(syncReportVO);
+
+                String reportUrl = null;
+                // 修改pdf路径
+                if ("prod".equals(env)) {
+                    try {
+                        byte[] bytes = pdfService.pdfByRefId(reportDO.getTemplateId(), reportDO.getId());
+                        List<SignValuesDTO> valuesDTOList = Lists.newArrayList();
+                        SignValuesDTO valuesDTO1 = new SignValuesDTO();
+                        valuesDTO1.setCode("JDY");
+                        valuesDTO1.setSealType("JYZ");
+                        valuesDTO1.setTextonce(0);
+                        valuesDTO1.setText("机构公章或");
+                        valuesDTOList.add(valuesDTO1);
+                        byte[] signedPdfBytes = boilerTaskOrderService.sign(bytes, valuesDTOList);
+                        reportUrl = fileApi.createFile(signedPdfBytes);
+                    } catch (Exception e) {
+                        log.info("出具报告盖章失败:{}", e.getMessage());
+
+                        try {
+                            byte[] bytes = pdfService.pdfByRefId(reportDO.getTemplateId(), reportDO.getId());
+                            ByteArrayOutputStream recordOutputStreamReport = new ByteArrayOutputStream();
+                            recordOutputStreamReport.write(bytes);
+                            // excel 转 pdf
+                            reportUrl = fileApi.createFile(recordOutputStreamReport.toByteArray());
+                        } catch (Exception ex) {
+                            log.error("出具报告失败:{}", ex.getMessage());
+                        }
+                    }
+
+                }else {
+                    try {
+                        byte[] bytes = pdfService.pdfByRefId(reportDO.getTemplateId(), reportDO.getId());
+                        ByteArrayOutputStream recordOutputStreamReport = new ByteArrayOutputStream();
+                        recordOutputStreamReport.write(bytes);
+                        // excel 转 pdf
+                        reportUrl = fileApi.createFile(recordOutputStreamReport.toByteArray());
+                    } catch (Exception ex) {
+                        log.error("出具报告失败:{}", ex.getMessage());
+                    }
+                }
+                com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<BoilerTaskOrderItemReportDO> updateWrapper2 =
+                        new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<BoilerTaskOrderItemReportDO>()
+                                .set(BoilerTaskOrderItemReportDO::getOpinionReportedUrl, reportUrl)
+                                .set(BoilerTaskOrderItemReportDO::getEnterPdfUrl , reportUrl)
+                                .eq(BoilerTaskOrderItemReportDO::getId, reportDO.getId())
+                        ;
+                boilerTaskOrderItemReportMapper.update(updateWrapper2);
             }
         } catch (Exception e) {
             throw exception(new ErrorCode(10017,"检验意见通知书整改-执行失败：" + e.getMessage()));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerTaskOrderItemReportServiceImpl.java

@@ -187,10 +187,12 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
             status = 4;
             updateWrapper.set(BoilerTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus());
             updateWrapper.set(BoilerTaskOrderItemReportDO::getIssueUrl, taskOrderItemReportDO.getRectificationUrl());
+            updateWrapper.set(BoilerTaskOrderItemReportDO::getEnterPdfUrl, taskOrderItemReportDO.getRectificationUrl());
         } else if (Integer.valueOf(2).equals(reqVo.getApprovalType())) {
             status = 5;
             updateWrapper.set(BoilerTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus());
             updateWrapper.set(BoilerTaskOrderItemReportDO::getIssueUrl, taskOrderItemReportDO.getRectificationUrl());
+            updateWrapper.set(BoilerTaskOrderItemReportDO::getEnterPdfUrl, taskOrderItemReportDO.getRectificationUrl());
         } else {
             if (StringUtil.isEmpty(reqVo.getRejectionReason())) {
                 throw exception(new ErrorCode(10070, "拒绝原因不能为空"));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderService.java

@@ -1,6 +1,7 @@
 package cn.start.tz.module.pressure2.service.pipetaskorder;
 
 import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.module.infra.api.sign.dto.SignValuesDTO;
 import cn.start.tz.module.pressure2.api.taskorder.dto.UpdatePayStatusDTO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.*;
 import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespVO;
@@ -254,4 +255,5 @@ public interface PipeTaskOrderService extends IService<PipeTaskOrderDO>  {
 
     byte[] getRecordOutputStreamMerge(String orderId);
 
+    byte[] sign(byte[] bytes, List<SignValuesDTO> valuesDTOList) throws Exception;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -1,7 +1,6 @@
 package cn.start.tz.module.pressure2.service.pipetaskorder;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -40,26 +39,15 @@ import cn.start.tz.module.pressure2.api.taskorder.dto.UpdatePayStatusDTO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.TeamItemVO;
 import cn.start.tz.module.pressure2.controller.admin.equipboilerscheduling.vo.BoilerDeleteTask;
 import cn.start.tz.module.pressure2.controller.admin.platformEquip.vo.PipeTaskOrderItemDetailsVO;
-import cn.start.tz.module.pressure2.controller.app.taskorder.vo.TaskOrderPaymentRespVo;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.OrderItemReportUpdateVO;
-import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
-import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
-import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreportuser.BoilerTaskOrderItemReportUserDO;
-import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderreport.BoilerTaskOrderReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskordersignfile.BoilerTaskOrderSignFileDO;
-import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTaskOrderUserDO;
 import cn.start.tz.module.pressure2.dal.dataobject.businessmemberrelation.BusinessMemberRelationDO;
-import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
-import cn.start.tz.module.pressure2.dal.dataobject.equipboilerschedulingitem.EquipBoilerSchedulingCheckDO;
-import cn.start.tz.module.pressure2.dal.dataobject.indextodo.IndexTodoDO;
 import cn.start.tz.module.pressure2.dal.dataobject.notificationformreport.NotificationformReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.opinionnotificationfollowrecord.OpinionNotificationFollowRecordDO;
-import cn.start.tz.module.pressure2.dal.dataobject.orderreport.OrderReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderinput.PipeTaskOrderInputDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilerconnectrecordreport.BoilerConnectRecordReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskordersignfile.BoilerTaskOrderSignFileMapper;
 import cn.start.tz.module.pressure2.dal.mysql.businessmemberrelation.BusinessMemberRelationMapper;
-import cn.start.tz.module.pressure2.dal.mysql.indextodo.IndexTodoMapper;
 import cn.start.tz.module.pressure2.dal.mysql.notificationformreport.NotificationformReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipeacceptorderuser.PipeAcceptOrderUserMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderinput.PipeTaskOrderInputMapper;
@@ -71,7 +59,6 @@ import cn.start.tz.module.pressure2.controller.admin.bpmtaskinfo.vo.BpmTaskRespV
 import cn.start.tz.module.pressure2.controller.admin.costfield.vo.CostFieldRespVO;
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.controller.admin.equippipe.vo.EquipPipeRespVO;
-import cn.start.tz.module.pressure2.controller.admin.inspectionnature.vo.InspectionNatureTemplateDetailRespVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.*;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitem.vo.PipeTaskOrderItemPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitem.vo.PipeTaskOrderItemRespVO;
@@ -142,7 +129,6 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskordersecuritycheck.PipeTas
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderuser.PipeTaskOrderUserMapper;
 import cn.start.tz.module.pressure2.framework.thread.CommonThread;
 import cn.start.tz.module.pressure2.service.boilerconnectrecordreport.BoilerConnectRecordReportService;
-import cn.start.tz.module.pressure2.service.boilertaskorderissuereport.BoilerTaskOrderIssueReportService;
 import cn.start.tz.module.pressure2.service.common.RedisService;
 import cn.start.tz.module.pressure2.service.costfield.CostFieldService;
 import cn.start.tz.module.pressure2.service.dynamictb.DynamicTbService;
@@ -179,7 +165,6 @@ import cn.start.tz.module.system.api.dept.dto.DeptRespDTO;
 import cn.start.tz.module.system.api.dict.DictDataApi;
 import cn.start.tz.module.system.api.dict.dto.DictDataRespDTO;
 import cn.start.tz.module.system.api.orgcontact.OrgContactApi;
-import cn.start.tz.module.system.api.orgcontact.dto.OrgContactDTO;
 import cn.start.tz.module.system.api.user.AdminUserApi;
 import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
 import cn.start.tz.module.system.enums.TemplateInitDataEnums;
@@ -194,7 +179,6 @@ import com.github.yulichang.query.MPJLambdaQueryWrapper;
 import com.google.common.collect.Lists;
 import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
@@ -213,7 +197,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.nio.channels.Pipe;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -7226,7 +7209,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
 
         return signApi.getSignFile(signUrl).getCheckedData();
     }
-    private byte[] sign(byte[] bytes, List<SignValuesDTO> valuesDTOList) throws Exception {
+    @Override
+    public byte[] sign(byte[] bytes, List<SignValuesDTO> valuesDTOList) throws Exception {
         CntSignReqDTO signReqDTO = new CntSignReqDTO();
         signReqDTO.setBytes(bytes);
         signReqDTO.setValuesDTOList(valuesDTOList);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeAppTaskOrderItemReportServiceImpl.java

@@ -7,6 +7,8 @@ import cn.start.tz.framework.common.pojo.PageResult;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.start.tz.framework.security.core.util.SecurityFrameworkUtils;
 import cn.start.tz.framework.security.core.LoginUser;
+import cn.start.tz.module.infra.api.file.FileApi;
+import cn.start.tz.module.infra.api.sign.dto.SignValuesDTO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderPageReqVO;
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.BoilerTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeOrderItemPageRespVO;
@@ -15,6 +17,7 @@ import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportSignReqVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorderitemreport.vo.PipeTaskOrderItemReportSignRespVO;
 import cn.start.tz.module.pressure2.controller.app.taskorderitemreport.vo.InspectionOpinionUploadReqVo;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipe.EquipPipeDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorder.PipeTaskOrderDO;
 import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitem.PipeTaskOrderItemDO;
@@ -24,7 +27,9 @@ import cn.start.tz.module.pressure2.dal.mysql.pipetaskorder.PipeTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitem.PipeTaskOrderItemMapper;
 import cn.start.tz.module.pressure2.dal.mysql.pipetaskorderitemreport.PipeTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.framework.appauth.core.context.AppAuthContextHolder;
+import cn.start.tz.module.pressure2.service.pdf.PdfService;
 import cn.start.tz.module.pressure2.service.pipetaskorder.PipeTaskOrderService;
+import com.google.common.collect.Lists;
 import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -32,8 +37,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.io.ByteArrayOutputStream;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
@@ -72,6 +79,16 @@ public class PipeAppTaskOrderItemReportServiceImpl implements PipeAppTaskOrderIt
     @Resource
     private RedissonClient redissonClient;
 
+    @Value("${tz.env.name}")
+    private String env;
+
+    @Resource
+    private PdfService pdfService;
+
+    @Resource
+    private FileApi fileApi;
+
+
     @Override
     public PageResult<PipeOrderItemPageRespVO> appInspectionOpinionPage(PipeTaskOrderPageReqVO pageReqVO) {
         // 不传单位code时根据当前登录人memberId查询
@@ -143,6 +160,53 @@ public class PipeAppTaskOrderItemReportServiceImpl implements PipeAppTaskOrderIt
                 syncReportVO.setRefId(reportDO.getId());
                 syncReportVO.setReportType("record");
                 pipeTaskOrderService.syncReportData(syncReportVO);
+
+
+                String reportUrl = null;
+                // 修改pdf路径
+                if ("prod".equals(env)) {
+                    try {
+                        byte[] bytes = pdfService.pdfByRefId(reportDO.getTemplateId(), reportDO.getId());
+                        List<SignValuesDTO> valuesDTOList = Lists.newArrayList();
+                        SignValuesDTO valuesDTO1 = new SignValuesDTO();
+                        valuesDTO1.setCode("JDY");
+                        valuesDTO1.setSealType("JYZ");
+                        valuesDTO1.setTextonce(0);
+                        valuesDTO1.setText("机构公章或");
+                        valuesDTOList.add(valuesDTO1);
+                        byte[] signedPdfBytes = pipeTaskOrderService.sign(bytes, valuesDTOList);
+                        reportUrl = fileApi.createFile(signedPdfBytes);
+                    } catch (Exception e) {
+                        log.info("出具报告盖章失败:{}", e.getMessage());
+
+                        try {
+                            byte[] bytes = pdfService.pdfByRefId(reportDO.getTemplateId(), reportDO.getId());
+                            ByteArrayOutputStream recordOutputStreamReport = new ByteArrayOutputStream();
+                            recordOutputStreamReport.write(bytes);
+                            // excel 转 pdf
+                            reportUrl = fileApi.createFile(recordOutputStreamReport.toByteArray());
+                        } catch (Exception ex) {
+                            log.error("出具报告失败:{}", ex.getMessage());
+                        }
+                    }
+
+                }else {
+                    try {
+                        byte[] bytes = pdfService.pdfByRefId(reportDO.getTemplateId(), reportDO.getId());
+                        ByteArrayOutputStream recordOutputStreamReport = new ByteArrayOutputStream();
+                        recordOutputStreamReport.write(bytes);
+                        // excel 转 pdf
+                        reportUrl = fileApi.createFile(recordOutputStreamReport.toByteArray());
+                    } catch (Exception ex) {
+                        log.error("出具报告失败:{}", ex.getMessage());
+                    }
+                }
+                com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<PipeTaskOrderItemReportDO> updateWrapper2 =
+                        new com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<PipeTaskOrderItemReportDO>()
+                                .set(PipeTaskOrderItemReportDO::getEnterPdfUrl, reportUrl)
+                                .eq(PipeTaskOrderItemReportDO::getId, reportDO.getId())
+                        ;
+                pipeTaskOrderItemReportMapper.update(updateWrapper2);
             }
         } catch (Exception e) {
             throw exception(new ErrorCode(10017,"检验意见通知书整改-执行失败：" + e.getMessage()));

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeTaskOrderItemReportServiceImpl.java

@@ -175,10 +175,12 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
             status = 4;
             updateWrapper.set(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus());
             updateWrapper.set(PipeTaskOrderItemReportDO::getIssueUrl, taskOrderItemReportDO.getRectificationUrl());
+            updateWrapper.set(PipeTaskOrderItemReportDO::getEnterPdfUrl, taskOrderItemReportDO.getRectificationUrl());
         } else if (Integer.valueOf(2).equals(reqVo.getApprovalType())) {
             status = 5;
             updateWrapper.set(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_FINISH.getStatus());
             updateWrapper.set(PipeTaskOrderItemReportDO::getIssueUrl, taskOrderItemReportDO.getRectificationUrl());
+            updateWrapper.set(PipeTaskOrderItemReportDO::getEnterPdfUrl, taskOrderItemReportDO.getRectificationUrl());
         } else {
             if (StringUtil.isEmpty(reqVo.getRejectionReason())) {
                 throw exception(new ErrorCode(10070, "拒绝原因不能为空"));