From 3bc99b32ffd7d8a77984a9951a0279ec78fd425d Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Wed, 18 May 2022 11:56:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84OA=20app=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/api/oa/OaAppController.java | 2 +- .../app/route/oa/OaAppRouteController.java | 46 ++++ .../oa/OaFormReportAppRouteController.java | 17 +- .../resources/static/form/css/form-app.css | 38 +--- .../resources/static/form/css/oa-form.css | 3 +- .../resources/static/form/js/oa-form-util.js | 205 ++++++++++-------- .../ftl/page/app/oa/app-form-save.ftl | 8 +- 7 files changed, 182 insertions(+), 137 deletions(-) create mode 100644 module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/route/oa/OaAppRouteController.java diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/api/oa/OaAppController.java b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/api/oa/OaAppController.java index 04a62c25..9962659d 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/api/oa/OaAppController.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/api/oa/OaAppController.java @@ -98,7 +98,7 @@ public class OaAppController extends DefaultBaseController { } @GetMapping("list-process-log/process-instance-id/{processInstanceId}") - public List listProcessLog(@PathVariable("processInstanceId") String processInstanceId) { + public List listProcessLog(@RequestHeader("token") String token, @PathVariable("processInstanceId") String processInstanceId) { return oaService.listProcessLog(processInstanceId); } diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/route/oa/OaAppRouteController.java b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/route/oa/OaAppRouteController.java new file mode 100644 index 00000000..7ae88488 --- /dev/null +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/route/oa/OaAppRouteController.java @@ -0,0 +1,46 @@ +package ink.wgink.module.activiti.controller.app.route.oa; + +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.module.activiti.service.activiti.IActivitiModelService; +import ink.wgink.module.activiti.service.oa.IOaFormReportRouteService; +import ink.wgink.pojo.result.ErrorResult; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +/** + * @ClassName: OaAppRouteController + * @Description: Oa管理 + * @Author: wanggeng + * @Date: 2022/3/23 09:54 + * @Version: 1.0 + */ +@Api(tags = ISystemConstant.API_TAGS_APP_ROUTE_PREFIX + "oa管理") +@Controller +@RequestMapping(ISystemConstant.APP_ROUTE_PREFIX + "/oa") +public class OaAppRouteController extends DefaultBaseController { + + @Autowired + private IActivitiModelService activitiModelService; + + @ApiOperation(value = "查看运行流程图", notes = "查看运行流程图接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "processInstanceId", value = "流程实例ID", paramType = "path"), + @ApiImplicitParam(name = "token", value = "token", paramType = "query") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-runtime-process-image/{processInstanceId}") + public void getRuntimeProcessImage(@PathVariable("processInstanceId") String processInstanceId, @RequestParam("token") String token, HttpServletResponse response) { + activitiModelService.getRuntimeProcessImage(response, processInstanceId); + } + +} diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/route/oa/OaFormReportAppRouteController.java b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/route/oa/OaFormReportAppRouteController.java index 7c5c3a80..11b6c67f 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/route/oa/OaFormReportAppRouteController.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/controller/app/route/oa/OaFormReportAppRouteController.java @@ -2,8 +2,10 @@ package ink.wgink.module.activiti.controller.app.route.oa; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.module.activiti.service.activiti.IActivitiModelService; import ink.wgink.module.activiti.service.oa.IOaFormReportRouteService; -import io.swagger.annotations.Api; +import ink.wgink.pojo.result.ErrorResult; +import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -26,6 +28,8 @@ public class OaFormReportAppRouteController extends DefaultBaseController { @Autowired private IOaFormReportRouteService oaFormReportRouteService; + @Autowired + private IActivitiModelService activitiModelService; @GetMapping("save/definition-id/{processDefinitionId}/code/{formCode}/version/{formVersion}") public void get(@PathVariable("processDefinitionId") String processDefinitionId, @@ -60,4 +64,15 @@ public class OaFormReportAppRouteController extends DefaultBaseController { oaFormReportRouteService.appShow(token, formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } + @ApiOperation(value = "查看运行流程图", notes = "查看运行流程图接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "processInstanceId", value = "流程实例ID", paramType = "path"), + @ApiImplicitParam(name = "token", value = "token", paramType = "query") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get-runtime-process-image/{processInstanceId}") + public void getRuntimeProcessImage(@PathVariable("processInstanceId") String processInstanceId, @RequestParam("token") String token, HttpServletResponse response) { + activitiModelService.getRuntimeProcessImage(response, processInstanceId); + } + } diff --git a/module-form/src/main/resources/static/form/css/form-app.css b/module-form/src/main/resources/static/form/css/form-app.css index de987f42..9edc4680 100644 --- a/module-form/src/main/resources/static/form/css/form-app.css +++ b/module-form/src/main/resources/static/form/css/form-app.css @@ -34,7 +34,6 @@ .layui-form-pane .layui-form-text .layui-textarea { border-width: 0; padding: 0; - line-height: 0.3rem; resize: none; } @@ -48,44 +47,21 @@ display: block; } -.layui-form-item:last-child { - margin-bottom: 1rem; -} - -.layui-btn { +.layui-btn.layui-btn-xs { height: 30px; line-height: 30px; padding: 0 8px; } -.layui-layout-admin .layui-footer { - padding: 0.1rem 0; -} - .form-report-foot { padding: 0 !important; } /* 上传图片 */ -.form-upload-image { - position: relative; - display: inline-block; - margin: 0 0.22rem 0.15rem 0; -} - -.form-upload-image:nth-child(3n) { - margin: 0 0 0.15rem 0; -} .form-upload-image:last-child { margin-right: 0; } -.form-upload-image img { - width: 2.15rem; - height: 2.15rem; - object-fit: cover; -} - .layui-btn-container { text-align: left; } @@ -111,12 +87,6 @@ } /* 上传视频 */ -.form-upload-video { - position: relative; - display: inline-block; - margin: 0.1rem 0.1rem 0 0; -} - .form-upload-video:last-child { margin-right: 0; } @@ -129,12 +99,6 @@ } /* 上传音频 */ -.form-upload-audio { - position: relative; - display: inline-block; - margin: 0.1rem 0.1rem 0 0; -} - .form-upload-audio:last-child { margin-right: 0; } diff --git a/module-form/src/main/resources/static/form/css/oa-form.css b/module-form/src/main/resources/static/form/css/oa-form.css index ef2b9c31..6e38b46b 100644 --- a/module-form/src/main/resources/static/form/css/oa-form.css +++ b/module-form/src/main/resources/static/form/css/oa-form.css @@ -17,7 +17,7 @@ padding: 15px 0; z-index: 100; background-color: #FFF; - border-bottom: 1px solid #f1f1f1; + border-top: 1px solid #f1f1f1; } .layui-card { @@ -54,6 +54,7 @@ #runtimeProcessImageBox { position: relative; + overflow: auto; } #operationBtnBox { diff --git a/module-form/src/main/resources/static/form/js/oa-form-util.js b/module-form/src/main/resources/static/form/js/oa-form-util.js index 3588d5ab..e86a75e7 100644 --- a/module-form/src/main/resources/static/form/js/oa-form-util.js +++ b/module-form/src/main/resources/static/form/js/oa-form-util.js @@ -98,79 +98,87 @@ function OaFormUtil(layui) { /** * 初始化日志 */ - function initProcessLog(processInstanceId) { - restAjax.get(restAjax.path('api/oa/list-process-log/process-instance-id/{processInstanceId}', [processInstanceId]), {}, null, function (code, data) { - var ul = ''; + $('#processLog').append(ul); }, function (code, data) { layer.msg(data.msg); }); @@ -180,11 +188,17 @@ function OaFormUtil(layui) { * 初始化流程图 * @param processInstanceId */ - function initProcessImage(processInstanceId) { + function initProcessImage(processInstanceId, isApp, headers) { + var src; + if(isApp) { + src = 'approute/oa/get-runtime-process-image/' + processInstanceId +'?token='+ headers.token; + } else { + src = 'route/activiti/model/get-runtime-process-image/' + processInstanceId; + } function initRuntimeProcessImage() { var html = [ '
', - ' 流转图', + ' 流转图', '
', '
', ' '); + $('#submitBtnGroup').append(''); var html = '
'; html += '
'; - html += '
'; + html += '
'; + html += '
'; for (var i = 0, item; item = confirmAssignees[i++];) { appButtonCount++; - html += '' + html += '' } html += '
'; html += '
'; html += '
'; + html += '
'; $('#submitBtnGroup').append(html) @@ -413,37 +435,36 @@ function OaFormUtil(layui) { var buttons = ''; if(isApp) { - buttons += '' + buttons += '' buttons += '
'; buttons += '
'; - buttons += '
' - if(formButton.btnPrint) { - buttons += ''; - appButtonCount++; - } + buttons += '
'; + buttons += '
'; + // app端无打印 if (formButton.btnGoBack) { - buttons += ''; + buttons += ''; appButtonCount++; } if(formButton.btnForcedEnd) { - buttons += ''; + buttons += ''; appButtonCount++; } if(formButton.btnCc) { - buttons += ''; + buttons += ''; appButtonCount++; } if(formButton.btnTransfer) { - buttons += ''; + buttons += ''; appButtonCount++; } if (formButton.btnAttachment) { - buttons += ''; + buttons += ''; appButtonCount++; } buttons += '
'; buttons += '
'; buttons += '
'; + buttons += '
'; } else { buttons += '
' if(formButton.btnPrint) { @@ -467,7 +488,7 @@ function OaFormUtil(layui) { buttons += '
'; } buttons += '
'; - buttons += ''; + buttons += ''; buttons += ''; buttons += ''; buttons += '
'; diff --git a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-save.ftl b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-save.ftl index 96ceafdb..981ac01f 100644 --- a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-save.ftl +++ b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-save.ftl @@ -22,10 +22,10 @@
-
+
-
+
@@ -125,9 +125,7 @@ $('#formCode').val(), $('#formVersion').val(), ]), formData.field, { - headers: { - token: token - } + headers: {token: token} }, function (code, data) { // 这里手动添加操作成功后的操作', layer.msg('提交成功', {time: 1000}, function() {