diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java index 8ea8912..d796ba9 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java @@ -93,7 +93,7 @@ public class MallProductController extends BaseController { @ApiOperation(value = "添加模型") @PostMapping("/insert") - public AjaxResult addupdateModel(@RequestBody RequestModel requestModel) { + public R addupdateModel(@RequestBody RequestModel requestModel) { ModelProduct modelProduct = requestModel.getModelProduct(); Long userId = SecurityUtils.getUserId(); modelProduct.setUserId(userId); @@ -130,7 +130,7 @@ public class MallProductController extends BaseController { */ @ApiOperation(value = "查询模型详情") @GetMapping("/selectModelById") - public AjaxResult selectModelById(@Valid @NotNull(message = "模型id不能为空") @RequestParam Long id) { + public R selectModelById(@Valid @NotNull(message = "模型id不能为空") @RequestParam Long id) { return modelService.selectModelById(id); } diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java index e2b4b98..b418856 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/WorkFlowVersion.java @@ -60,17 +60,17 @@ public class WorkFlowVersion { @ApiModelProperty("删除标志(0代表存在 2代表删除)") private String delFlag; - /** - * 审核状态(0全部状态 1已发布-公开 2已发布-仅自己可见 3审核中 4审核未通过) - */ - @ApiModelProperty("审核状态(0全部状态 1已发布-公开 2已发布-仅自己可见 3审核中 4审核未通过)") - private Integer auditStatus = 3; - - /** - * 审核失败原因 - */ - @ApiModelProperty("审核失败原因") - private String auditText; +// /** +// * 审核状态(0全部状态 1已发布-公开 2已发布-仅自己可见 3审核中 4审核未通过) +// */ +// @ApiModelProperty("审核状态(0全部状态 1已发布-公开 2已发布-仅自己可见 3审核中 4审核未通过)") +// private Integer auditStatus = 3; +// +// /** +// * 审核失败原因 +// */ +// @ApiModelProperty("审核失败原因") +// private String auditText; /** * 工作流ID diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddWorkFlowVersion.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddWorkFlowVersion.java index 6f159ea..226a061 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddWorkFlowVersion.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/AddWorkFlowVersion.java @@ -66,17 +66,17 @@ public class AddWorkFlowVersion { @ApiModelProperty("删除标志(0代表存在 2代表删除)") private String delFlag; - /** - * 审核状态(0全部状态 1已发布-公开 2已发布-仅自己可见 3审核中 4审核未通过) - */ - @ApiModelProperty("审核状态(0全部状态 1已发布-公开 2已发布-仅自己可见 3审核中 4审核未通过)") - private Integer auditStatus = 3; - - /** - * 审核失败原因 - */ - @ApiModelProperty("审核失败原因") - private String auditText; +// /** +// * 审核状态(0全部状态 1已发布-公开 2已发布-仅自己可见 3审核中 4审核未通过) +// */ +// @ApiModelProperty("审核状态(0全部状态 1已发布-公开 2已发布-仅自己可见 3审核中 4审核未通过)") +// private Integer auditStatus = 3; +// +// /** +// * 审核失败原因 +// */ +// @ApiModelProperty("审核失败原因") +// private String auditText; /** * 模型ID diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java index 28a2b22..af621c6 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/WorkFlowServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mcwl.common.constant.DictConstants; import com.mcwl.common.constant.HttpStatus; -import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.domain.R; import com.mcwl.common.core.domain.entity.SysUser; import com.mcwl.common.core.page.TableDataInfo; @@ -318,7 +317,6 @@ public class WorkFlowServiceImpl extends ServiceImpl i //批量修改 for (WorkFlowVersion workFlowVersion : requestWorkFlow.getWorkFlowVersionList()) { - workFlowVersion.setAuditStatus(3); // workFlowVersionMapper.updateWorkFlowVersion(workFlowVersion); if (workFlowVersion.getId() != null){ workFlowVersionMapper.updateById(workFlowVersion);