update 人员节点排序
This commit is contained in:
@@ -20,5 +20,6 @@
|
|||||||
<if test="processInstanceId != null and processInstanceId != ''">
|
<if test="processInstanceId != null and processInstanceId != ''">
|
||||||
group by pn.id
|
group by pn.id
|
||||||
</if>
|
</if>
|
||||||
|
ORDER BY pn.sort
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
-21
@@ -2,9 +2,7 @@ package com.jero.modules.activiti.process.fb.controller;
|
|||||||
|
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
import com.jero.common.aspect.annotation.AutoLog;
|
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.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.entity.ProcessFbEntryChange;
|
||||||
import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService;
|
import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService;
|
||||||
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
|
||||||
@@ -33,30 +31,11 @@ public class ProcessFbEntryChangeController extends JeroController<ProcessFbEntr
|
|||||||
@Autowired
|
@Autowired
|
||||||
private IProcessFbEntryChangeService processFbEntryChangeService;
|
private IProcessFbEntryChangeService processFbEntryChangeService;
|
||||||
|
|
||||||
@AutoLog(value = "标准法规入库_变更流程-添加业务信息")
|
|
||||||
@ApiOperation(value = "标准法规入库_变更流程-添加业务信息", notes = "标准法规入库_变更流程-添加业务信息")
|
|
||||||
@PostMapping(value = "/addBusinessInfo")
|
|
||||||
public Result<T> 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<T> edit(@Validated @RequestBody ProcessFbEntryChange processFbEntryChange) {
|
|
||||||
processFbEntryChangeService.editBusinessInfo(processFbEntryChange);
|
|
||||||
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
|
|
||||||
}
|
|
||||||
|
|
||||||
@AutoLog(value = "标准法规入库_变更流程-通过id查询")
|
@AutoLog(value = "标准法规入库_变更流程-通过id查询")
|
||||||
@ApiOperation(value = "标准法规入库_变更流程-通过id查询", notes = "标准法规入库_变更流程-通过id查询")
|
@ApiOperation(value = "标准法规入库_变更流程-通过id查询", notes = "标准法规入库_变更流程-通过id查询")
|
||||||
@GetMapping(value = "/queryBusinessInfo")
|
@GetMapping(value = "/queryBusinessInfo")
|
||||||
public Result<ProcessFbEntryChange> queryBusinessInfo(@RequestParam(name = "id") String id) {
|
public Result<ProcessFbEntryChange> queryBusinessInfo(@RequestParam(name = "id") String id) {
|
||||||
ProcessFbEntryChange processFbEntryChange = processFbEntryChangeService.queryBusinessInfo(id);
|
ProcessFbEntryChange processFbEntryChange = processFbEntryChangeService.queryBusinessInfo(id);
|
||||||
if (processFbEntryChange == null) {
|
|
||||||
return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
|
|
||||||
}
|
|
||||||
return Result.OK(processFbEntryChange);
|
return Result.OK(processFbEntryChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user