feat:部门查询

pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/TaskController.java

@@ -15,104 +15,123 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/task")
 public class TaskController {
 
-	private final ITaskService taskService;
+    private final ITaskService taskService;
 
-	/**
-	 * 查询首页数据看板
-	 * @return
-	 */
-	@SneakyThrows
-	@GetMapping("queryTaskData")
-	public R queryTaskData() {
-		return taskService.queryTaskData();
-	}
+    /**
+     * 查询首页数据看板
+     *
+     * @return
+     */
+    @SneakyThrows
+    @GetMapping("queryTaskData")
+    public R queryTaskData() {
+        return taskService.queryTaskData();
+    }
 
-	/**
-	 * 查询任务
-	 * @param taskId
-	 * @return
-	 */
-	@SneakyThrows
-	@GetMapping("queryTask")
-	public R queryTask(String taskId, boolean view) {
+    /**
+     * 查询任务
+     *
+     * @param taskId
+     * @return
+     */
+    @SneakyThrows
+    @GetMapping("queryTask")
+    public R queryTask(String taskId, boolean view) {
 
-		return taskService.queryTask(taskId, view);
+        return taskService.queryTask(taskId, view);
 
-	}
+    }
 
-	/**
-	 * 完成任务
-	 * @param completeParamDto
-	 * @return
-	 */
-	@SneakyThrows
-	@PostMapping("completeTask")
-	public R completeTask(@RequestBody TaskParamDto completeParamDto) {
+    /**
+     * 完成任务
+     *
+     * @param completeParamDto
+     * @return
+     */
+    @SneakyThrows
+    @PostMapping("completeTask")
+    public R completeTask(@RequestBody TaskParamDto completeParamDto) {
 
-		return taskService.completeTask(completeParamDto);
+        return taskService.completeTask(completeParamDto);
 
-	}
+    }
 
-	/**
-	 * 前加签
-	 * @param completeParamDto
-	 * @return
-	 */
-	@SneakyThrows
-	@PostMapping("delegateTask")
-	public R delegateTask(@RequestBody TaskParamDto completeParamDto) {
+    /**
+     * 批量完成任务
+     *
+     * @return
+     */
+    @SneakyThrows
+    @PostMapping("batchCompleteTask")
+    public R batchCompleteTask(@RequestBody TaskParamDto completeParamDto) {
+        return taskService.completeTask(completeParamDto);
+    }
 
-		return taskService.delegateTask(completeParamDto);
+    /**
+     * 前加签
+     *
+     * @param completeParamDto
+     * @return
+     */
+    @SneakyThrows
+    @PostMapping("delegateTask")
+    public R delegateTask(@RequestBody TaskParamDto completeParamDto) {
 
-	}
+        return taskService.delegateTask(completeParamDto);
 
-	/**
-	 * 加签完成任务
-	 * @param completeParamDto
-	 * @return
-	 */
-	@SneakyThrows
-	@PostMapping("resolveTask")
-	public R resolveTask(@RequestBody TaskParamDto completeParamDto) {
+    }
 
-		return taskService.resolveTask(completeParamDto);
+    /**
+     * 加签完成任务
+     *
+     * @param completeParamDto
+     * @return
+     */
+    @SneakyThrows
+    @PostMapping("resolveTask")
+    public R resolveTask(@RequestBody TaskParamDto completeParamDto) {
 
-	}
+        return taskService.resolveTask(completeParamDto);
 
-	/**
-	 * 设置执行人
-	 * @param completeParamDto
-	 * @return
-	 */
-	@SneakyThrows
-	@PostMapping("setAssignee")
-	public R setAssignee(@RequestBody TaskParamDto completeParamDto) {
+    }
 
-		return taskService.setAssignee(completeParamDto);
+    /**
+     * 设置执行人
+     *
+     * @param completeParamDto
+     * @return
+     */
+    @SneakyThrows
+    @PostMapping("setAssignee")
+    public R setAssignee(@RequestBody TaskParamDto completeParamDto) {
 
-	}
+        return taskService.setAssignee(completeParamDto);
 
-	/**
-	 * 结束流程
-	 * @param completeParamDto
-	 * @return
-	 */
-	@SneakyThrows
-	@PostMapping("stopProcessInstance")
-	public R stopProcessInstance(@RequestBody TaskParamDto completeParamDto) {
+    }
 
-		return taskService.stopProcessInstance(completeParamDto);
+    /**
+     * 结束流程
+     *
+     * @param completeParamDto
+     * @return
+     */
+    @SneakyThrows
+    @PostMapping("stopProcessInstance")
+    public R stopProcessInstance(@RequestBody TaskParamDto completeParamDto) {
 
-	}
+        return taskService.stopProcessInstance(completeParamDto);
 
-	/**
-	 * 退回
-	 * @param taskParamDto
-	 * @return
-	 */
-	@PostMapping("back")
-	public R back(@RequestBody TaskParamDto taskParamDto) {
-		return taskService.back(taskParamDto);
-	}
+    }
+
+    /**
+     * 退回
+     *
+     * @param taskParamDto
+     * @return
+     */
+    @PostMapping("back")
+    public R back(@RequestBody TaskParamDto taskParamDto) {
+        return taskService.back(taskParamDto);
+    }
 
 }

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml

@@ -269,7 +269,7 @@
 
     <select id="sumAndCount" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderSumAndCountVo">
         select
-        a.dept_id,
+        a.dept_id as deptId,
         sum(a.pay_price) as sum,
         count(0) as count
         from hard_order a