系统上的修改

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/task/asTaskController.java

@@ -12,8 +12,7 @@ import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo
 import cn.iocoder.yudao.module.as.controller.admin.task.vo.task.asTaskRespVO;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentsPersonManageDO;
 import cn.iocoder.yudao.module.as.service.aidingstudentspersonmanage.AidingStudentsPersonManageService;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
 import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
 import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
@@ -64,7 +63,7 @@ public class asTaskController {
     @Resource
     private AidingStudentsPersonManageService aidingStudentsPersonManageService;
     @GetMapping("/todo-page-aiding")
-    @Operation(summary = "获取 Todo 综测审批待办任务分页")
+    @Operation(summary = "获取 Todo 家庭经济困难认定审批待办任务分页")
     @PreAuthorize("@ss.hasPermission('eve:task:query')")
     public CommonResult<Map<String,List<AidingStudentPersonManageInfoPageReqVO>>> getTaskTodoPageAiding(@Valid BpmTaskPageReqVO pageVO) {
         //获取我的任务中家困任务的列表
@@ -116,7 +115,7 @@ public class asTaskController {
 
 
     @GetMapping("/done-page-comprehensive")
-    @Operation(summary = "获取 Done 综测审批已办任务分页")
+    @Operation(summary = "获取 Done 家庭经济困难认定审批已办任务分页")
     @PreAuthorize("@ss.hasPermission('eve:task:query')")
     public CommonResult<Map<String,List<AidingStudentPersonManageInfoPageReqVO>>> getTaskDonePageComprehensive(@Valid BpmTaskPageReqVO pageVO) {
         List<HistoricTaskInstance> pageResult = taskService.getTaskDonePageComprehensive(getLoginUserId(), pageVO);
@@ -175,159 +174,70 @@ public class asTaskController {
 //        return success(eveTaskConvert.INSTANCE.buildTaskDoneByPeople(pageResult, processInstanceMap, userMap,achievementDOMap));
 //    }
 //
-//    @PutMapping("/approve")
-//    @Operation(summary = "通过单项综测审批")
-//    @PreAuthorize("@ss.hasPermission('eve:task:update')")
-//    public CommonResult<Boolean> approveTask(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-//        taskService.approveTaskAchievement(getLoginUserId(), reqVO);
-//        return success(true);
-//    }
-//
-//    @PutMapping("/approve-edit")
-//    @Operation(summary = "单项审批修改")
-//    @PreAuthorize("@ss.hasPermission('eve:achievement:update')")
-//    public CommonResult<Boolean> approveTaskEdit(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-//        taskService.approveTaskAchievement(getLoginUserId(), reqVO);
-//        return success(true);
-//    }
-//
-//    @PutMapping("/approve-people")
-//    @Operation(summary = "整体通过综测审批")
-//    @PreAuthorize("@ss.hasPermission('eve:task:update')")
-//    public CommonResult<Boolean> approveTaskByPeople(@Valid @RequestBody List<BpmTaskApproveReqVO> reqVOList) {
-//        taskService.approveTaskAchievementByPeople(getLoginUserId(), reqVOList);
-//
-//        return success(true);
-//    }
-//
-//    @PostMapping("/approve-college-rank")
-//    @Operation(summary = "学院针对当前完成互评状态的条目进行审核并发起公示和排名")
-//    @PreAuthorize("@ss.hasPermission('eve:comprehensive-college-manage:update')")
-//    @Transactional
-//    public CommonResult<Boolean> approveTaskAndRankByCollege(@Valid @RequestBody BpmTaskPageReqVO pageVO) {
-//        Long deptId = adminUserApi.getUser(getLoginUserId()).getDeptId();
-//        Long collegeId =  deptApi.getCollegeId(deptId);
-//        DeptRespDTO dept = deptApi.getDept(collegeId);
-//        ComprehensiveCollegeManageDO comprehensiveCollegeManage
-//                =  comprehensiveCollegeManageService.getComprehensiveCollegeManage(pageVO.getManageId(), collegeId);
-//
-//        if(comprehensiveCollegeManage.getComStatus() != 1){
-//            throw exception(ALREADY_PUBLICIZED);
-//        }
-//        comprehensiveCollegeManage.setComStatus(2);
-//        comprehensiveCollegeManageService.updateComprehensiveCollegeManage(
-//                BeanUtils.toBean(comprehensiveCollegeManage, ComprehensiveCollegeManageSaveReqVO.class)
-//        );
-//        List<Task> pageResult = taskService.getTaskTodoPageComprehensive(getLoginUserId(), pageVO);
-//
-//        if (CollUtil.isEmpty(pageResult)) {
-//            return success(null);
-//        }
-//
-//        List<AchievementDO> achievementList = achievementService.getAchievementByProcessInstanceIds(
-//                convertList(pageResult,Task::getProcessInstanceId),pageVO.getManageId());
-//
-//        List<BpmTaskApproveReqVO> vpPageResult = new ArrayList<>();
-//
-//        for (Task respVO : pageResult) {
-//            for(AchievementDO achievement : achievementList){
-//                if(achievement.getProcessInstanceId().equals(respVO.getProcessInstanceId())){
-//                    BpmTaskApproveReqVO eveRespVO = BeanUtils.toBean(respVO, BpmTaskApproveReqVO.class);
-//                    vpPageResult.add(eveRespVO);
-//                }
-//            }
-//        }
-//
-//        taskService.approveTaskAchievementByPeople(getLoginUserId(), vpPageResult);
-//
-//        comprehensiveService.comprehensiveCalculateByCollegeID(
-//                collegeId,pageVO.getManageId(),1 , "学院公示"
-//        );
-//
-//        comprehensiveService.comprehensiveRanking(collegeId,dept.getBs(),pageVO.getManageId());
-//
-//        return success(true);
-//    }
-//
-//    @GetMapping("/approve-college")
-//    @Operation(summary = "学院确认（即批量通过当前状态为学院公示的审批）")
-//    @PreAuthorize("@ss.hasPermission('eve:comprehensive-college-manage:update')")
-//    @Transactional
-//    public CommonResult<Boolean> approveTaskByCollege(@Valid BpmTaskPageReqVO pageVO) {
-//        List<Task> pageResult = taskService.getTaskTodoPageComprehensive(getLoginUserId(), pageVO);
-//        if (CollUtil.isEmpty(pageResult)) {
-//            return success(null);
-//        }
-//        Long deptId = adminUserApi.getUser(SecurityFrameworkUtils.getLoginUserId()).getDeptId();
-//        Long collegeId =  deptApi.getCollegeId(deptId);
-//        ComprehensiveCollegeManageDO comprehensiveCollegeManage
-//                =  comprehensiveCollegeManageService.getComprehensiveCollegeManage(pageVO.getManageId(), collegeId);
-//        if(comprehensiveCollegeManage.getComStatus() != 2){
-//            throw exception(PLEASE_START_PUBLICIZED);
-//        }
-//        comprehensiveCollegeManageService.updateComprehensiveCollegeManage(
-//                BeanUtils.toBean(comprehensiveCollegeManage.setComStatus(3), ComprehensiveCollegeManageSaveReqVO.class)
-//        );
-//        List<AchievementDO> achievementList = achievementService.getAchievementByProcessInstanceIds(
-//                convertList(pageResult,Task::getProcessInstanceId),pageVO.getManageId());
-//
-//        List<BpmTaskApproveReqVO> vpPageResult = new ArrayList<>();
-//
-//        for (Task respVO : pageResult) {
-//            for(AchievementDO achievement : achievementList){
-//                if(achievement.getProcessInstanceId().equals(respVO.getProcessInstanceId())){
-//                    BpmTaskApproveReqVO eveRespVO = BeanUtils.toBean(respVO, BpmTaskApproveReqVO.class);
-//                    vpPageResult.add(eveRespVO);
-//                }
-//            }
-//        }
-//        taskService.approveTaskAchievementByPeople(getLoginUserId(), vpPageResult);
-//        return success(true);
-//    }
-//
-//    @PutMapping("/reject-update")
-//    @Operation(summary = "不通过任务：驳回到审批人处")
-//    @PreAuthorize("@ss.hasPermission('eve:task:update')")
-//    public CommonResult<Boolean> rejectAchievementTask(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
-//        taskService.rejectAchievementTask(getLoginUserId(), reqVO);
-//
-//        return success(true);
-//    }
-//
-//    @PutMapping("/reject-people-update")
-//    @Operation(summary = "整体不通过任务：驳回到审批人处")
-//    @PreAuthorize("@ss.hasPermission('eve:task:update')")
-//    public CommonResult<Boolean> rejectAchievementTaskByPeople(@Valid @RequestBody List<BpmTaskApproveReqVO> reqVOList) {
-//        taskService.rejectAchievementTaskByPeople(getLoginUserId(), reqVOList);
-//        return success(true);
-//    }
-//
-//    @PutMapping("/reject")
-//    @Operation(summary = "不通过任务:直接结束流程")
-//    @PreAuthorize("@ss.hasPermission('eve:task:update')")
-//    public CommonResult<Boolean> rejectTask(@Valid @RequestBody BpmTaskRejectReqVO reqVO) {
-//        taskService.rejectTask(getLoginUserId(), reqVO);
-//        return success(true);
-//    }
-//
-//    @PutMapping("/reject-people")
-//    @Operation(summary = "整体不通过综测审批:直接结束流程")
-//    @PreAuthorize("@ss.hasPermission('eve:task:update')")
-//    public CommonResult<Boolean> rejectTaskByPeople(@Valid @RequestBody List<BpmTaskRejectReqVO> reqVOList) {
-//        taskService.rejectTaskByPeople(getLoginUserId(), reqVOList);
-//        return success(true);
-//    }
-//
-//    @PutMapping("/reject-undo")
-//    @Operation(summary = "在下一个人审批前退回审批")
-//    @PreAuthorize("@ss.hasPermission('eve:task:update')")
-//    public CommonResult<Boolean> rejectUndoTask(@Valid @RequestBody BpmTaskUndoReqVO reqVO) {
-//        taskService.UndoTask(getLoginUserId(), reqVO);
-////        taskService.rejectTaskByPeople(getLoginUserId(), reqVOList);
-//
-////        return error(400,"改流程不能修改！");
-//
-//        return success(true);
-//    }
+    @PutMapping("/approve")
+    @Operation(summary = "通过单项家庭经济困难认定审批")
+    @PreAuthorize("@ss.hasPermission('eve:task:update')")
+    public CommonResult<Boolean> approveTask(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        taskService.approveTaskAchievement(getLoginUserId(), reqVO);
+        return success(true);
+    }
+
+    @PutMapping("/approve-edit")
+    @Operation(summary = "单项审批修改")
+    @PreAuthorize("@ss.hasPermission('eve:achievement:update')")
+    public CommonResult<Boolean> approveTaskEdit(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        taskService.approveTaskAchievement(getLoginUserId(), reqVO);
+        return success(true);
+    }
+
+    @PutMapping("/approve-people")
+    @Operation(summary = "整体通过综测审批")
+    @PreAuthorize("@ss.hasPermission('eve:task:update')")
+    public CommonResult<Boolean> approveTaskByPeople(@Valid @RequestBody List<BpmTaskApproveReqVO> reqVOList) {
+        taskService.approveTaskAchievementByPeople(getLoginUserId(), reqVOList);
+        return success(true);
+    }
+
+
+    @PutMapping("/reject-update")
+    @Operation(summary = "不通过任务：驳回到审批人处")
+    @PreAuthorize("@ss.hasPermission('eve:task:update')")
+    public CommonResult<Boolean> rejectAchievementTask(@Valid @RequestBody BpmTaskApproveReqVO reqVO) {
+        taskService.rejectAchievementTask(getLoginUserId(), reqVO);
+
+        return success(true);
+    }
+
+    @PutMapping("/reject-people-update")
+    @Operation(summary = "整体不通过任务：驳回到审批人处")
+    @PreAuthorize("@ss.hasPermission('eve:task:update')")
+    public CommonResult<Boolean> rejectAchievementTaskByPeople(@Valid @RequestBody List<BpmTaskApproveReqVO> reqVOList) {
+        taskService.rejectAchievementTaskByPeople(getLoginUserId(), reqVOList);
+        return success(true);
+    }
+
+    @PutMapping("/reject")
+    @Operation(summary = "不通过任务:直接结束流程")
+    @PreAuthorize("@ss.hasPermission('eve:task:update')")
+    public CommonResult<Boolean> rejectTask(@Valid @RequestBody BpmTaskRejectReqVO reqVO) {
+        taskService.rejectTask(getLoginUserId(), reqVO);
+        return success(true);
+    }
+
+    @PutMapping("/reject-people")
+    @Operation(summary = "整体不通过综测审批:直接结束流程")
+    @PreAuthorize("@ss.hasPermission('eve:task:update')")
+    public CommonResult<Boolean> rejectTaskByPeople(@Valid @RequestBody List<BpmTaskRejectReqVO> reqVOList) {
+        taskService.rejectTaskByPeople(getLoginUserId(), reqVOList);
+        return success(true);
+    }
+
+    @PutMapping("/reject-undo")
+    @Operation(summary = "在下一个人审批前退回审批")
+    @PreAuthorize("@ss.hasPermission('eve:task:update')")
+    public CommonResult<Boolean> rejectUndoTask(@Valid @RequestBody BpmTaskUndoReqVO reqVO) {
+        taskService.UndoTask(getLoginUserId(), reqVO);
+        return success(true);
+    }
 
 }