zhou zhou
9 小时以前 1b0b16862c1941c5a4e6e8c538e1a27c55d4ab81
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
@@ -60,21 +60,31 @@
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:save')")
    @OperationLog("Create 物料权限")
    @PostMapping("/taskPathTemplateMerge/save")
    public R save(@RequestBody TaskPathTemplateMerge taskPathTemplateMerge) {
        taskPathTemplateMerge.setCreateBy(getLoginUserId());
        taskPathTemplateMerge.setCreateTime(new Date());
        taskPathTemplateMerge.setUpdateBy(getLoginUserId());
        taskPathTemplateMerge.setUpdateTime(new Date());
        if (Cools.isEmpty(taskPathTemplateMerge.getSourceType(),taskPathTemplateMerge.getTargetType())) {
            return R.error();
    public R save(@RequestBody TaskPathTemplateMerge taskPathTemplateMerges) {
        List<String> sourceTypeR = taskPathTemplateMerges.getSourceTypeR();
        List<String> targetTypeR = taskPathTemplateMerges.getTargetTypeR();
        for (String sourceType : sourceTypeR) {
            for (String targetType : targetTypeR) {
                TaskPathTemplateMerge taskPathTemplateMerge = new TaskPathTemplateMerge();
                taskPathTemplateMerge.setConditionExpression(taskPathTemplateMerges.getConditionExpression());
                taskPathTemplateMerge.setSourceType(sourceType);
                taskPathTemplateMerge.setTargetType(targetType);
                taskPathTemplateMerge.setCreateBy(getLoginUserId());
                taskPathTemplateMerge.setCreateTime(new Date());
                taskPathTemplateMerge.setUpdateBy(getLoginUserId());
                taskPathTemplateMerge.setUpdateTime(new Date());
                if (Cools.isEmpty(taskPathTemplateMerge.getSourceType(),taskPathTemplateMerge.getTargetType())) {
                    return R.error();
                }
                String name = taskPathTemplateMerge.getSourceType()+"==>"+taskPathTemplateMerge.getTargetType();
                taskPathTemplateMerge.setTemplateName(name);
                taskPathTemplateMerge.setTemplateCode(name);
                if (!taskPathTemplateMergeService.save(taskPathTemplateMerge)) {
                    return R.error("Save Fail");
                }
            }
        }
        String name = taskPathTemplateMerge.getSourceType()+"==>"+taskPathTemplateMerge.getTargetType();
        taskPathTemplateMerge.setTemplateName(name);
        taskPathTemplateMerge.setTemplateCode(name);
        if (!taskPathTemplateMergeService.save(taskPathTemplateMerge)) {
            return R.error("Save Fail");
        }
        return R.ok("Save Success").add(taskPathTemplateMerge);
        return R.ok("Save Success").add(taskPathTemplateMerges);
    }
    @PreAuthorize("hasAuthority('system:taskPathTemplateMerge:update')")