diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml index e462c4e3..6e9f24f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessNodeMapper.xml @@ -20,5 +20,6 @@ group by pn.id + ORDER BY pn.sort \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java index 6ab960f3..954d01fd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbEntryChangeController.java @@ -2,9 +2,7 @@ package com.jero.modules.activiti.process.fb.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.process.common.entity.TransferVO; -import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO; import com.jero.modules.activiti.process.fb.entity.ProcessFbEntryChange; import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; @@ -33,30 +31,11 @@ public class ProcessFbEntryChangeController extends JeroController addBusinessInfo(@Validated @RequestBody ProcessFbEntryChange processFbEntryChange) { - processFbEntryChangeService.addBusinessInfo(processFbEntryChange); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - - @AutoLog(value = "标准法规入库_变更流程-编辑业务信息") - @ApiOperation(value = "标准法规入库_变更流程-编辑业务信息", notes = "标准法规入库_变更流程-编辑业务信息") - @PostMapping(value = "/editBusinessInfo") - public Result edit(@Validated @RequestBody ProcessFbEntryChange processFbEntryChange) { - processFbEntryChangeService.editBusinessInfo(processFbEntryChange); - return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); - } - @AutoLog(value = "标准法规入库_变更流程-通过id查询") @ApiOperation(value = "标准法规入库_变更流程-通过id查询", notes = "标准法规入库_变更流程-通过id查询") @GetMapping(value = "/queryBusinessInfo") public Result queryBusinessInfo(@RequestParam(name = "id") String id) { ProcessFbEntryChange processFbEntryChange = processFbEntryChangeService.queryBusinessInfo(id); - if (processFbEntryChange == null) { - return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND); - } return Result.OK(processFbEntryChange); }