Merge remote-tracking branch 'origin/dev' into dev

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/tasksign/TaskSignServiceImpl.java

@@ -212,15 +212,15 @@ public class TaskSignServiceImpl implements TaskSignService {
         }
 
         // 保存或更新签名文件记录
-        saveOrUpdateSignFile(taskOrderSignFileDO, taskOrderDO, reqVO);
+        BoilerTaskOrderSignFileDO proceedTaskOrderSignFileDO = saveOrUpdateSignFile(taskOrderSignFileDO, taskOrderDO, reqVO);
 
         // 根据业务类型生成对应的报告
         String url = handleReportGeneration(taskOrderDO, reqVO);
 
-        taskOrderSignFileDO.setSignFilePdf(url);
+        proceedTaskOrderSignFileDO.setSignFilePdf(url);
 
         // 生成pdf
-        boilerTaskOrderSignFileService.updateById(taskOrderSignFileDO);
+        boilerTaskOrderSignFileService.updateById(proceedTaskOrderSignFileDO);
     }
 
     /**
@@ -483,12 +483,13 @@ public class TaskSignServiceImpl implements TaskSignService {
      * @param taskOrderDO      任务单
      * @param reqVO            签名提交请求
      */
-    private void saveOrUpdateSignFile(BoilerTaskOrderSignFileDO existingSignFile,
+    private BoilerTaskOrderSignFileDO saveOrUpdateSignFile(BoilerTaskOrderSignFileDO existingSignFile,
                                       BoilerTaskOrderDO taskOrderDO,
                                       TaskOrderPushReqVO reqVO) {
         if (ObjectUtil.isNotNull(existingSignFile)) {
             fillSignFileFields(existingSignFile, reqVO);
             boilerTaskOrderSignFileService.updateById(existingSignFile);
+            return existingSignFile;
         } else {
             BoilerTaskOrderSignFileDO newSignFile = new BoilerTaskOrderSignFileDO();
             newSignFile.setOrderId(taskOrderDO.getId());
@@ -497,6 +498,7 @@ public class TaskSignServiceImpl implements TaskSignService {
             newSignFile.setSecurityCheckId(reqVO.getSecurityCheckId());
             fillSignFileFields(newSignFile, reqVO);
             boilerTaskOrderSignFileService.save(newSignFile);
+            return newSignFile;
         }
     }