From f8f12e3d637533efec49481a7983c81a4f589c26 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Wed, 23 Mar 2022 18:22:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/oa/OaController.java | 29 ++++++++++- .../activiti/impl/ActivitiServiceImpl.java | 2 +- .../src/main/resources/static/stencilset.json | 2 +- .../resources/templates/activiti/list.html | 50 +++++++------------ 4 files changed, 48 insertions(+), 35 deletions(-) diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/oa/OaController.java b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/oa/OaController.java index fc4b2481..5d5a949c 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/oa/OaController.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/api/oa/OaController.java @@ -2,12 +2,19 @@ package ink.wgink.module.activiti.controller.api.oa; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.module.activiti.pojo.dtos.oa.OaProcdefDTO; import ink.wgink.module.activiti.service.oa.IOaService; -import io.swagger.annotations.Api; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResultList; +import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @ClassName: OaController * @Description: Oa管理 @@ -23,6 +30,26 @@ public class OaController extends DefaultBaseController { @Autowired private IOaService oaService; + @ApiOperation(value = "流程定义分页列表", notes = "流程定义分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-procdef") + public List listProcdef() { + return oaService.listProcdef(); + } + @ApiOperation(value = "流程定义分页列表", notes = "流程定义分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage-procdef") + public SuccessResultList> listPageProcdef(ListPage page) { + return oaService.listPageProcdef(page.getPage(), page.getRows()); + } } diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java index 6354f0b4..41c04f32 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/activiti/impl/ActivitiServiceImpl.java @@ -220,7 +220,7 @@ public class ActivitiServiceImpl extends DefaultBaseService implements IActiviti editorObject.put("resourceId", "canvas"); JSONObject stencilSetObject = new JSONObject(); - stencilSetObject.put("namespace", "wgink"); + stencilSetObject.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#"); editorObject.put("stencilset", stencilSetObject); repositoryService.addModelEditorSource(modelId, editorObject.toString().getBytes(ISystemConstant.CHARSET_UTF8)); diff --git a/module-activiti/src/main/resources/static/stencilset.json b/module-activiti/src/main/resources/static/stencilset.json index a17d1fde..9c96ce6f 100644 --- a/module-activiti/src/main/resources/static/stencilset.json +++ b/module-activiti/src/main/resources/static/stencilset.json @@ -89,7 +89,7 @@ "id": "process_namespace", "type": "String", "title": "目标命名空间", - "value": "www.wgink.ink", + "value": "http://www.activiti.org/processdef", "description": "工作流目标命名空间", "popular": true } diff --git a/module-activiti/src/main/resources/templates/activiti/list.html b/module-activiti/src/main/resources/templates/activiti/list.html index 5d908093..2c4ab1b9 100644 --- a/module-activiti/src/main/resources/templates/activiti/list.html +++ b/module-activiti/src/main/resources/templates/activiti/list.html @@ -24,12 +24,6 @@ - - @@ -130,9 +124,13 @@ return flowChatImg; } }, - {field: 'option2', width: 80, title: '操作', align:'center', fixed: 'right', + {field: 'option2', width: 160, title: '操作', align:'center', fixed: 'right', templet: function(row) { - return ''; + return '
' + + '' + + '' + + '' + + '
'; } }, ] @@ -208,30 +206,6 @@ reloadTable(); } }); - } else if(layEvent === 'updateEvent') { - if(checkDatas.length === 0) { - top.dialog.msg(top.dataMessage.table.selectEdit); - } else if(checkDatas.length > 1) { - top.dialog.msg(top.dataMessage.table.selectOneEdit); - } else { - top.dialog.open({ - url: top.restAjax.path('route/activiti/update?modelId={modelId}', [checkDatas[0].id]), - title: false, - width: '90%', - height: '90%', - onClose: function() { - reloadTable(); - } - }); - } - } else if(layEvent === 'removeEvent') { - if(checkDatas.length === 0) { - top.dialog.msg(top.dataMessage.table.selectDelete); - } else if(checkDatas.length > 1) { - top.dialog.msg(top.dataMessage.table.selectOneEdit); - } else { - removeData(checkDatas[0].id); - } } }); @@ -253,6 +227,18 @@ top.dialog.close(loadLayerIndex); }); }); + } else if(layEvent === 'updateEvent') { + top.dialog.open({ + url: top.restAjax.path('route/activiti/update?modelId={modelId}', [data.id]), + title: false, + width: '90%', + height: '90%', + onClose: function() { + reloadTable(); + } + }); + } else if(layEvent === 'removeEvent') { + removeData(data.id); } }); });