审核审批

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

@@ -3908,8 +3908,12 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         log.info("发起oa审核");
         try {
             ExternalOACreateFlowRes externalOAFlow = createExternalOAFlow(taskOrderItemReportDO,updateObj);
-            updateObj.setSummaryId(externalOAFlow.getData().getSummaryId());
-            taskOrderItemReportMapper.updateById(updateObj);
+            if (externalOAFlow.getData() == null){
+                log.error(externalOAFlow.getMessage());
+            }else {
+                updateObj.setSummaryId(externalOAFlow.getData().getSummaryId());
+                taskOrderItemReportMapper.updateById(updateObj);
+            }
         } catch (Exception e) {
             log.error("发起oa审核异常", e);
         }

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

@@ -584,6 +584,32 @@ public class BoilerTaskOrderItemReportServiceImpl extends ServiceImpl<BoilerTask
                         needUpdateReport.set(true);
                     }
                 });
+        // 找最新的"审批人员"节点的退回评论
+        comments.stream()
+                .filter(comment -> latestRecord == null || comment.getCreateDate().isAfter(latestRecord.getCreateTime()))
+                .filter(c -> c.getComment() != null
+                        && "common.toolbar.stepBack.label".equals(c.getExtAtt3())
+                        && c.getNodeName() != null && c.getNodeName().contains("审批"))
+                .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
+                .ifPresent(ratify -> {
+                    reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_APPROVAL.getStatus());
+                    reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getRatifyId, null);
+                    reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getRatifyTime, null);
+                    needUpdateReport.set(true);
+                });
+        // 找最新的"审核人员"节点的退回评论
+//        comments.stream()
+//                .filter(comment -> latestRecord == null || comment.getCreateDate().isAfter(latestRecord.getCreateTime()))
+//                .filter(c -> c.getComment() != null
+//                        && "common.toolbar.stepBack.label".equals(c.getExtAtt3())
+//                        && c.getNodeName() != null && c.getNodeName().contains("审核"))
+//                .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
+//                .ifPresent(ratify -> {
+//                    reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_PREPARE.getStatus());
+//                    reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getApprovalId, null);
+//                    reportUpdateWrapper.set(BoilerTaskOrderItemReportDO::getApprovalTime, null);
+//                    needUpdateReport.set(true);
+//                });
 
         if (needUpdateReport.get()) {
             taskOrderItemReportMapper.update(reportUpdateWrapper);

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

@@ -3119,10 +3119,17 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
      */
     private void sendApproval(PipeTaskOrderItemReportDO taskOrderItemReportDO, PipeTaskOrderItemReportDO updateObj) throws Exception {
         log.info("发起oa审核");
-
+        try {
             ExternalOACreateFlowRes externalOAFlow = createExternalOAFlow(taskOrderItemReportDO, updateObj);
-            updateObj.setSummaryId(externalOAFlow.getData().getSummaryId());
-            taskOrderItemReportMapper.updateById(updateObj);
+            if (externalOAFlow.getData() == null) {
+                log.error(externalOAFlow.getMessage());
+            } else {
+                updateObj.setSummaryId(externalOAFlow.getData().getSummaryId());
+                taskOrderItemReportMapper.updateById(updateObj);
+            }
+        } catch (Exception e) {
+            log.error("发起oa审核异常", e);
+        }
     }
     /**
      * 创建外部OA流程

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

@@ -15,6 +15,7 @@ import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.Inspecti
 import cn.start.tz.module.pressure2.controller.admin.boilertaskorder.vo.ReportUploadVO;
 import cn.start.tz.module.pressure2.controller.admin.pipetaskorder.vo.PipeTaskOrderSyncReportVO;
 import cn.start.tz.module.pressure2.controller.appapi.pipetaskorderitemreport.dto.PipeTaskOrderItemReportConclusionReq;
+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.equippipecheckhistory.EquipPipeCheckHistoryDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equippipedetail.EquipPipeDetailDO;
@@ -287,7 +288,7 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                     PipeTaskOrderItemReportRecordDO pipeTaskOrderItemReportRecordDO = new PipeTaskOrderItemReportRecordDO();
                     pipeTaskOrderItemReportRecordDO.setReportId(pipeTaskOrderItemReportDO.getId());
                     pipeTaskOrderItemReportRecordDO.setProcess(
-                            comment.getNodeName() != null && comment.getNodeName().contains("审核") ? 700 : 600);
+                            comment.getNodeName() != null && comment.getNodeName().contains("审核") ? 600 : 700);
                     pipeTaskOrderItemReportRecordDO.setRemark(comment.getComment());
                     pipeTaskOrderItemReportRecordDO.setCreateTime(comment.getCreateDate());
                     String userName = comment.getUserName();
@@ -370,6 +371,32 @@ public class PipeTaskOrderItemReportServiceImpl extends ServiceImpl<PipeTaskOrde
                         needUpdateReport.set(true);
                     }
                 });
+        // 找最新的"审批人员"节点的退回评论
+        comments.stream()
+                .filter(comment -> latestRecord == null || comment.getCreateDate().isAfter(latestRecord.getCreateTime()))
+                .filter(c -> c.getComment() != null
+                        && "common.toolbar.stepBack.label".equals(c.getExtAtt3())
+                        && c.getNodeName() != null && c.getNodeName().contains("审批"))
+                .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
+                .ifPresent(ratify -> {
+                    reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_APPROVAL.getStatus());
+                    reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getRatifyId, null);
+                    reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getRatifyTime, null);
+                    needUpdateReport.set(true);
+                });
+        // 找最新的"审核人员"节点的退回评论
+//        comments.stream()
+//                .filter(comment -> latestRecord == null || comment.getCreateDate().isAfter(latestRecord.getCreateTime()))
+//                .filter(c -> c.getComment() != null
+//                        && "common.toolbar.stepBack.label".equals(c.getExtAtt3())
+//                        && c.getNodeName() != null && c.getNodeName().contains("审核"))
+//                .max(Comparator.comparing(ExternalOACommentInfoRes::getCreateDate))
+//                .ifPresent(ratify -> {
+//                    reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getTaskStatus, TaskOrderStatusEnum.REPORT_PREPARE.getStatus());
+//                    reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getApprovalId, null);
+//                    reportUpdateWrapper.set(PipeTaskOrderItemReportDO::getApprovalTime, null);
+//                    needUpdateReport.set(true);
+//                });
 
         if (needUpdateReport.get()) {
             taskOrderItemReportMapper.update(reportUpdateWrapper);