1

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

@@ -124,35 +124,35 @@ public class TranTaskInfoServiceImpl extends ServiceImpl<TranTaskInfoMapper, Tra
                 tranTaskInfo.getStatus(), null, "");
 
         //创建任务
-        if ("2710b21efc1e4393930c5dc800010dc4".equals(tranTaskInfo.getCompId())) {
-            List<CommonStaff> commonStaffList = staffService.selectList(new EntityWrapper<CommonStaff>()
-                    .eq("dept_id", "839073b95d9a4529ba55dba5104eba19")
-                    .eq("delete_flag","0"));
-            List<String> staffIds = commonStaffList.stream().map(CommonStaff::getStaffId).collect(Collectors.toList());
-        // 先删除任务
-        noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "TRANTASK-APPROVE",
-                tranTaskInfo.getId(), null);
-        String staffNames = "XXX";
-        CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
-        if (commitUserInfo != null) {
-            staffNames = commitUserInfo.getMajorRole() != null
-                    ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
-                    : commitUserInfo.getStaffName();
-        }
-        String taskContent = "";
-        // 向下一步操作人发送任务通知
-        taskContent = "运输任务" + staffNames + "内勤" + staffNames + "提交的" + tranTaskInfo.getTranType() + "运输任务待派发，请及时处理。";
-        NoticeTaskInfo taskInfo = new NoticeTaskInfo();
-        taskInfo.setCompId(commitUserInfo.getCompId());
-        taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
-        taskInfo.setBusinessId(tranTaskInfo.getId());
-        taskInfo.setBusinessType("TRANSPORTATIONTASK");
-        taskInfo.setMessageContent(taskContent);
-        taskInfo.setBusinessCode("TRANTASK-APPROVE");
-//            taskInfo.setNoticeTaskStatus(NoticeTaskInfo.NoticeTaskStatus.RETURN);
-        noticeTaskService.createNoticeTask(staffIds,
-                null, taskInfo);
-        }
+//        if ("2710b21efc1e4393930c5dc800010dc4".equals(tranTaskInfo.getCompId())) {
+//            List<CommonStaff> commonStaffList = staffService.selectList(new EntityWrapper<CommonStaff>()
+//                    .eq("dept_id", "839073b95d9a4529ba55dba5104eba19")
+//                    .eq("delete_flag","0"));
+//            List<String> staffIds = commonStaffList.stream().map(CommonStaff::getStaffId).collect(Collectors.toList());
+//        // 先删除任务
+//        noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "TRANTASK-APPROVE",
+//                tranTaskInfo.getId(), null);
+//        String staffNames = "XXX";
+//        CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+//        if (commitUserInfo != null) {
+//            staffNames = commitUserInfo.getMajorRole() != null
+//                    ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
+//                    : commitUserInfo.getStaffName();
+//        }
+//        String taskContent = "";
+//        // 向下一步操作人发送任务通知
+//        taskContent = "运输任务" + staffNames + "内勤" + staffNames + "提交的" + tranTaskInfo.getTranType() + "运输任务待派发，请及时处理。";
+//        NoticeTaskInfo taskInfo = new NoticeTaskInfo();
+//        taskInfo.setCompId(commitUserInfo.getCompId());
+//        taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
+//        taskInfo.setBusinessId(tranTaskInfo.getId());
+//        taskInfo.setBusinessType("TRANSPORTATIONTASK");
+//        taskInfo.setMessageContent(taskContent);
+//        taskInfo.setBusinessCode("TRANTASK-APPROVE");
+////            taskInfo.setNoticeTaskStatus(NoticeTaskInfo.NoticeTaskStatus.RETURN);
+//        noticeTaskService.createNoticeTask(staffIds,
+//                null, taskInfo);
+//        }
         // 假如 都成功返回ok
         if (one && two ) {
             return "OK";