1、我的申请增加流程状态

2、调课顶课台账作废接口调整

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

@@ -90,7 +90,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/receive-msg")
     @ApiOperation(value="接收消息")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<CourseReceiveMsg> receiveMsg(@RequestParam String schoolId, @RequestParam String eduYearSerialNo, @RequestParam String startDate, @RequestParam String endDate) throws Exception {
         CourseReceiveMsg courseReceiveMsg = new CourseReceiveMsg();
         courseReceiveMsg.setCreateDate(new Date());
@@ -107,7 +107,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/course-table")
     @ApiOperation(value="课表接口(PC端)")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<CourseTableVo> courseInfo(CourseTableDto dto){
         if(dto.getSemesterId() == null){
             LambdaQueryWrapper<BaseSemester> queryWrapper = new LambdaQueryWrapper<>();
@@ -125,7 +125,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/course-table-day")
     @ApiOperation(value="今日课表接口(手机端)")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<CourseTableVo> courseInfoDay(CourseTableDto dto){
         LocalDateTime now = LocalDateTime.now();
         DayOfWeek dayOfWeek = now.getDayOfWeek();
@@ -162,7 +162,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/current-week")
     @ApiOperation(value="获取当前周次")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<Integer> currentWeek(CourseTableDto dto){
         List<BaseSemester> semesterList = semesterService.list(new QueryWrapper<BaseSemester>().lambda().orderByDesc(BaseSemester::getStartDate));
         BaseSemester baseSemester = semesterList.get(0);
@@ -189,7 +189,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/adjust-list")
     @ApiOperation(value = "可以调课的课程")
-    @SaCheckPermission("evaluateobject:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<List<CourseListVo>> adjustList(CourseTableAdjustDto dto){
 //        if(dto.getAdjustDate() == null || dto.getTeacherId() == null){
 //            return RT.error("请传入调整日期和教师id");
@@ -203,7 +203,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/pre-check")
     @ApiOperation(value = "预检查")
-    @SaCheckPermission("evaluateobject:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<String> preCheck(CourseTablePreCheckDto dto) throws Exception {
         if(dto.getPreCheckType() != null){
             if(dto.getPreCheckType() == 1){
@@ -235,7 +235,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/getCourseNames")
     @ApiOperation(value = "查询课程接口")
-    @SaCheckPermission("evaluateobject:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<String> getCourseNames(String id){
         String[] split = id.split(",");
         List<CourseTable> list = courseTableService.list(
@@ -338,7 +338,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/login-url")
     @ApiOperation(value = "获取单点登录地址")
-    @SaCheckPermission("evaluateobject:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<String> getAccessToken() throws Exception {
         XjrUser xjrUser = teacherService.getById(StpUtil.getLoginIdAsLong());
         long timeMillis = System.currentTimeMillis();
@@ -365,7 +365,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/week-list")
     @ApiOperation(value="获取周次列表")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<List<ScheduleWeekVo>> weekList(@Valid ScheduleWeekDto dto){
         List<BaseSemester> semesterList = semesterService.list(new QueryWrapper<BaseSemester>().lambda().orderByDesc(BaseSemester::getStartDate));
         BaseSemester baseSemester = semesterList.get(0);
@@ -397,7 +397,7 @@ public class ScheduleController {
 
     @GetMapping(value = "/class-list")
     @ApiOperation(value="根据课表获取教师所教班级")
-    @SaCheckPermission("room:detail")
+    @SaCheckPermission("schedule:detail")
     public RT<List<ClassOptionVo>> classList(@Valid ClassOptionDto dto){
         if(dto.getUserId() == null){
             dto.setUserId(StpUtil.getLoginIdAsLong());
@@ -408,8 +408,8 @@ public class ScheduleController {
 
     @PostMapping(value = "/cancel")
     @ApiOperation(value="调课顶课的作废")
-    @SaCheckPermission("room:detail")
-    public RT<Boolean> cancel(@Valid WfCourseAdjustDto dto){
+    @SaCheckPermission("schedule:detail")
+    public RT<Boolean> cancel(@Valid @RequestBody WfCourseAdjustDto dto){
 
         return RT.ok(courseAdjustService.cancel(dto));
     }

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

@@ -3598,6 +3598,11 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                             .or()
                             .like(WorkflowExtra::getProcessName, dto.getKeyword()))
                     .orderByDesc(WorkflowExtra::getStartTime));
+            List<WorkflowFormRelation> relations = formRelationService.list(
+                    new QueryWrapper<WorkflowFormRelation>().lambda()
+                            .in(WorkflowFormRelation::getProcessId, processIds)
+            );
+            Map<String, String> stateMap = relations.stream().collect(Collectors.toMap(WorkflowFormRelation::getProcessId, WorkflowFormRelation::getCurrentState));
 
 
             for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
@@ -3633,7 +3638,19 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                             } else {
                                 vo.setCurrentProgress(e.getCurrentProgress());
                             }
-
+                            String currentState = stateMap.get(e.getProcessId());
+
+                            if(HistoricProcessInstance.STATE_SUSPENDED.equals(currentState)){
+                                vo.setState("挂起");
+                            }else if(HistoricProcessInstance.STATE_ACTIVE.equals(currentState)){
+                                vo.setState("审批中");
+                            }else if(HistoricProcessInstance.STATE_COMPLETED.equals(currentState)){
+                                vo.setState("审批完成");
+                            }else if(HistoricProcessInstance.STATE_EXTERNALLY_TERMINATED.equals(currentState)){
+                                vo.setState("外部终止");
+                            }else if(HistoricProcessInstance.STATE_INTERNALLY_TERMINATED.equals(currentState)){
+                                vo.setState("内部终止");
+                            }
                             result.add(vo);
                         });
             }

src/main/java/com/xjrsoft/module/workflow/vo/MyProcessPageVo.java

@@ -73,4 +73,7 @@ public class MyProcessPageVo {
     @ApiModelProperty("是否已审批(0:否 1:是)")
     private Integer isApproval;
 
+    @ApiModelProperty("状态")
+    private String state;
+
 }