完成任务优化 删除组托优化

skyouc

6 天以前 5f13213af588444a59d0b3725f3d028cbdaffca4

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java

@@ -10,6 +10,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
import com.vincent.rsf.server.manager.entity.TaskItem;
import com.vincent.rsf.server.manager.entity.WaitPakin;
@@ -108,22 +109,10 @@
    @PostMapping("/waitPakin/remove/{ids}")
    @Transactional(rollbackFor = Exception.class)
    public R remove(@PathVariable Long[] ids) {
        List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>()
                .in(WaitPakinItem::getPakinId, ids));
        if (!pakinItems.isEmpty()) {
            List<Long> list = pakinItems.stream().map(WaitPakinItem::getId).collect(Collectors.toList());
            List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getSource, list));
            if (!taskItems.isEmpty()) {
                return R.error("组拖档有明细任务");
            }
        if (Arrays.asList(ids).isEmpty()) {
            return R.error("参数不能为空！！");
        }
        if (!waitPakinService.removeByIds(Arrays.asList(ids))) {
            return R.error("Delete Fail");
        }
        if (!waitPakinItemService.removeByIds(pakinItems)) {
            throw new CoolException("明细删除失败！！");
        }
        return R.ok("Delete Success").add(ids);
        return waitPakinService.removePakin(Arrays.asList(ids));
    }

    @PreAuthorize("hasAuthority('manager:waitPakin:list')")
@@ -150,11 +139,14 @@
    @PreAuthorize("hasAuthority('manager:waitPakin:update')")
    @ApiOperation("生成任务列表")
    @PostMapping("/waitPakin/merge")
    public R generateTask(@RequestBody List<WaitPakin> waitPakin) {
        if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
    public R generateTask(@RequestBody GenerateTaskParams taskParams) {
        if (Objects.isNull(taskParams)) {
            throw new CoolException("参数不能为空！！");
        }
        return  taskService.generateTasks(waitPakin, getLoginUserId());
        if (Objects.isNull(taskParams.getWaitPakins()) || taskParams.getWaitPakins().isEmpty()) {
            throw new CoolException("组拖档不能为空！！");
        }
        return  taskService.generateTasks(taskParams, getLoginUserId());
    }

}