From 4fd2312a266c3f2d385231ab6247d00436f78e9c Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Wed, 18 May 2022 17:48:21 +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/route/oa/OaAppRouteController.java | 13 +++++++++++++ .../module/activiti/service/oa/IOaCcService.java | 9 +++++++++ .../service/oa/IOaFormReportRouteService.java | 13 +++++++++++++ .../activiti/service/oa/impl/OaCcServiceImpl.java | 9 +++++++++ .../oa/impl/OaFormReportRouteServiceImpl.java | 6 ++++++ .../templates/ftl/page/app/oa/app-form-show.ftl | 2 +- 6 files changed, 51 insertions(+), 1 deletion(-) 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 index 7ae88488..20224c37 100644 --- 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 @@ -31,6 +31,8 @@ public class OaAppRouteController extends DefaultBaseController { @Autowired private IActivitiModelService activitiModelService; + @Autowired + private IOaFormReportRouteService oaFormReportRouteService; @ApiOperation(value = "查看运行流程图", notes = "查看运行流程图接口") @ApiImplicitParams({ @@ -43,4 +45,15 @@ public class OaAppRouteController extends DefaultBaseController { activitiModelService.getRuntimeProcessImage(response, processInstanceId); } + @GetMapping("update-read/code/{formCode}/version/{formVersion}/cc-id/{ccId}") + public void updateRead(@PathVariable("formCode") String formCode, + @PathVariable("formVersion") Integer formVersion, + @PathVariable("ccId") String ccId, + @RequestParam("token") String token, + HttpSession httpSession, + HttpServletRequest httpServletRequest, + HttpServletResponse httpServletResponse) { + oaFormReportRouteService.updateRead(token, formCode, formVersion, ccId, httpSession, httpServletRequest, httpServletResponse); + } + } diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java index 6ff1945f..52a15f20 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java @@ -44,6 +44,15 @@ public interface IOaCcService { */ void updateRead(String ccId, int isRead); + /** + * 更新阅读状态 + * + * @param token + * @param ccId + * @param isRead + */ + void updateRead(String token, String ccId, int isRead); + /** * 抄送列表 * diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaFormReportRouteService.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaFormReportRouteService.java index 7dcc3996..ad6accb2 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaFormReportRouteService.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaFormReportRouteService.java @@ -73,6 +73,19 @@ public interface IOaFormReportRouteService { */ void updateRead(String formCode, Integer formVersion, String ccId, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); + /** + * 查询页面 + * + * @param token + * @param formCode + * @param formVersion + * @param ccId + * @param httpSession + * @param httpServletRequest + * @param httpServletResponse + */ + void updateRead(String token, String formCode, Integer formVersion, String ccId, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse); + /** * APP新增页面 diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java index 1504ba3b..437bc35f 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java @@ -91,6 +91,15 @@ public class OaCcServiceImpl extends DefaultBaseService implements IOaCcService oaCcDao.updateRead(params); } + @Override + public void updateRead(String token, String ccId, int isRead) { + Map params = getHashMap(4); + params.put("ccId", ccId); + params.put("isRead", isRead); + setAppUpdateInfo(token, params); + oaCcDao.updateRead(params); + } + @Override public List listPO(Map params) { params = params == null ? getHashMap(0) : params; diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java index 0842a0d5..e3b93ad5 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java @@ -136,6 +136,12 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements show(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } + @Override + public void updateRead(String token, String formCode, Integer formVersion, String ccId, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { + oaCcService.updateRead(token, ccId, 1); + show(formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); + } + @Override public void appSave(String token, String processDefinitionId, String formCode, Integer formVersion, HttpSession httpSession, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { AppTokenUser appTokenUser = getAppTokenUser(token); diff --git a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl index 503d389c..33cdc626 100644 --- a/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl +++ b/module-form/src/main/resources/templates/ftl/page/app/oa/app-form-show.ftl @@ -83,7 +83,7 @@ // console.log(obj); } }); - oaFormUtil.initTabItem(processInstanceId); + oaFormUtil.initTabItem(processInstanceId, {isApp:true, headers: {token: token}}); oaFormUtil.disableFormAllFields(); var self = this;