Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/job/AttendanceMessageTask.java

@@ -297,7 +297,7 @@ public class AttendanceMessageTask {
                 for (XjrUser xjrUser : userList) {
                     weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextId() + "");
                     weChatSendMessageDto.setUserId(xjrUser.getOpenId());
-                    //weChatService.sendTemplateMessage(weChatSendMessageDto);
+                    weChatService.sendTemplateMessage(weChatSendMessageDto);
                 }
                 isInsert = true;
             }

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -178,7 +178,7 @@ public class ScheduleController {
                 LocalDateTime startDate = startDateTime.plusDays(i * 6).withHour(0).withMinute(0).withSecond(0).withNano(0);
                 LocalDateTime endDate = startDateTime.plusDays((i + 1) * 6).withHour(23).withMinute(59).withSecond(59).withNano(9999);
                 if (now.isAfter(startDate) && now.isBefore(endDate)) {
-                    return RT.ok(i + 1);
+                    return RT.ok(i);
                 }
             }
         }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -1728,6 +1728,22 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             throw new MyException("找不到此任务！");
         }
 
+        Optional<HistoricProcessInstance> historicProcessInstance = getHistoricProcessInstance(task.getProcessInstanceId());
+        HistoricProcessInstance historicProcess = historicProcessInstance.get();
+        //如果流程挂起了，报错
+        if (HistoricProcessInstance.STATE_SUSPENDED.equals(historicProcess.getState())) {
+            List<WorkflowRecord> recordList = workflowRecordMapper.selectList(
+                    new QueryWrapper<WorkflowRecord>().lambda()
+                            .eq(WorkflowRecord::getProcessId, task.getProcessInstanceId())
+                            .orderByDesc(WorkflowRecord::getRecordTime)
+            );
+            String message = "流程已挂起，无法审核";
+            if(!recordList.isEmpty()){
+                message = recordList.get(0).getMessage();
+            }
+            throw new MyException(message);
+        }
+
         //获取当前任务变量中的  schemaId
         Long schemaId = Convert.toLong(taskService.getVariable(task.getId(), WorkflowConstant.PROCESS_SCHEMA_ID_KEY));
 
@@ -1840,7 +1856,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
         List<LaunchAndApproveVo> result = new ArrayList<>();
 
-        Optional<HistoricProcessInstance> historicProcessInstance = getHistoricProcessInstance(task.getProcessInstanceId());
+
 
         try {
             for (FormConfig formConfig : userTaskConfig.getFormConfigs()) {