更新

winsea-haixin-platform-backend/src/main/java/com/yh/saas/platform/controller/AppendixController.java

@@ -241,6 +241,7 @@ public class AppendixController implements InitializingBean {
         return null;
     }
 
+
     /**
      * 打包下载附件
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -738,37 +738,37 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
             if("1".equals(flagBatch)){
                 batchReviewInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
                 batchReviewInfoService.insert(batchReviewInfo);
-                boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(batchReviewInfo.getWorkflowId());
-                // 不是退回的单子
-                if (isStartWorkflow) {
-                    Workflow workflow = workflowService
-                            .findLatestWorkflowByBusinessCodeByApp(batchReviewInfo.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
-                    // 没配置审核流程，直接结束并处理信息
-                    if (workflow == null) {
-                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-                    }
-                    // 开启审核流
-                    else {
-
-                        // 设置状态 已提交审核
-                        batchReviewInfo.setWorkflowId(workflow.getId());
-                        batchReviewInfoService.updateById(batchReviewInfo);
-                        workflowService.startInstance(workflow.getId(), batchReviewInfo.getId());
-                    }
-                }
+//                boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(batchReviewInfo.getWorkflowId());
+//                // 不是退回的单子
+//                if (isStartWorkflow) {
+//                    Workflow workflow = workflowService
+//                            .findLatestWorkflowByBusinessCodeByApp(batchReviewInfo.getCompId(), "TRANSPORTATION-SETTLEMENT-REPORT");
+//                    // 没配置审核流程，直接结束并处理信息
+//                    if (workflow == null) {
+//                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//                    }
+//                    // 开启审核流
+//                    else {
+//
+//                        // 设置状态 已提交审核
+//                        batchReviewInfo.setWorkflowId(workflow.getId());
+//                        batchReviewInfoService.updateById(batchReviewInfo);
+//                        workflowService.startInstance(workflow.getId(), batchReviewInfo.getId());
+//                    }
+//                }
                 //  更新详细状态
-                batchReviewInfo = batchReviewInfoService.selectById(batchReviewInfo.getId());
-                List<TranSettlementReport> tranSettlementReports = tranSettlementReportService.selectList(new EntityWrapper<TranSettlementReport>()
-                        .eq("batch_id",batchReviewInfo.getId()));
-                if(!CollectionUtils.isEmpty(tranSettlementReports)){
-                    for(int i=0;i<tranSettlementReports.size();i++){
-                        TranSettlementReport settlementReport = tranSettlementReports.get(i);
-                        settlementReport.setWorkflowId(batchReviewInfo.getWorkflowId());
-                        settlementReport.setStatus(batchReviewInfo.getStatus());
-                        settlementReport.setApproveStatus(batchReviewInfo.getApproveStatus());
-                    }
-                    tranSettlementReportService.updateBatchById(tranSettlementReports);
-                }
+//                batchReviewInfo = batchReviewInfoService.selectById(batchReviewInfo.getId());
+//                List<TranSettlementReport> tranSettlementReports = tranSettlementReportService.selectList(new EntityWrapper<TranSettlementReport>()
+//                        .eq("batch_id",batchReviewInfo.getId()));
+//                if(!CollectionUtils.isEmpty(tranSettlementReports)){
+//                    for(int i=0;i<tranSettlementReports.size();i++){
+//                        TranSettlementReport settlementReport = tranSettlementReports.get(i);
+//                        settlementReport.setWorkflowId(batchReviewInfo.getWorkflowId());
+//                        settlementReport.setStatus(batchReviewInfo.getStatus());
+//                        settlementReport.setApproveStatus(batchReviewInfo.getApproveStatus());
+//                    }
+//                    tranSettlementReportService.updateBatchById(tranSettlementReports);
+//                }
             }
         }
         cacheComponent.delPrefixKey(Const.ADMIN_CONTRACTINFO);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/GeTuiUtils.java

@@ -116,6 +116,8 @@ public class GeTuiUtils {
             ups.addOption("HW", "/message/android/notification/sound", "/raw/ring");
             ups.addOption("HW", "/message/android/notification/channel_id", "task1");
             ups.addOption("HW", "/message/android/notification/importance", "HIGH");
+            ups.addOption("XM", "/extra.sound_uri", "android.resource://uni.UNI7297DA2/raw/task1");
+            ups.addOption("XM", "/extra.channel_id", "high_custom_5");
             //ups.addOption("VV","classification",1);
             androidDTO.setUps(ups);
             pushChannel.setAndroid(androidDTO);