完善OA app端代码

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);
+    }
+
 }

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);
+
     /**
      * 抄送列表
      *

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新增页面

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<String, Object> params = getHashMap(4);
+        params.put("ccId", ccId);
+        params.put("isRead", isRead);
+        setAppUpdateInfo(token, params);
+        oaCcDao.updateRead(params);
+    }
+
     @Override
     public List<OaCcPO> listPO(Map<String, Object> params) {
         params = params == null ? getHashMap(0) : params;

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);

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;