From 3af54c34492d0680b15dbc4cea3c1f20c3e94e4d Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Wed, 18 May 2022 18:20:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/service/oa/IOaCcService.java | 19 +- .../service/oa/impl/OaCcServiceImpl.java | 24 ++- .../oa/impl/OaFormReportRouteServiceImpl.java | 2 +- .../oa/impl/OaFormReportServiceImpl.java | 6 +- .../service/report/IFormReportService.java | 172 ++++++++++++++++++ 5 files changed, 216 insertions(+), 7 deletions(-) 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 52a15f20..112d3b3a 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 @@ -28,13 +28,30 @@ public interface IOaCcService { /** * 保存 * + * @param token + * @param oaCcVO + */ + void save(String token, OaCcVO oaCcVO); + + /** + * 保存 + * + * @param userId + * @param oaCcVO + */ + void saveByUserId(String userId, OaCcVO oaCcVO); + + /** + * 保存 + * + * @param userId * @param formCode * @param formVersion * @param processInstanceId * @param reportUid * @param userIds */ - void save(String formCode, Integer formVersion, String processInstanceId, String reportUid, List userIds); + void saveByUserId(String userId, String formCode, Integer formVersion, String processInstanceId, String reportUid, List userIds); /** * 更新阅读状态 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 437bc35f..f26bbb99 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 @@ -53,7 +53,27 @@ public class OaCcServiceImpl extends DefaultBaseService implements IOaCcService } @Override - public void save(String formCode, Integer formVersion, String processInstanceId, String reportUid, List userIds) { + public void save(String token, OaCcVO oaCcVO) { + String formCcId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(oaCcVO); + params.put("ccId", formCcId); + params.put("isRead", 0); + setAppSaveInfo(token, params); + oaCcDao.save(params); + } + + @Override + public void saveByUserId(String userId, OaCcVO oaCcVO) { + String formCcId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(oaCcVO); + params.put("ccId", formCcId); + params.put("isRead", 0); + setSaveInfoByUserId(params, userId); + oaCcDao.save(params); + } + + @Override + public void saveByUserId(String saveUserId, String formCode, Integer formVersion, String processInstanceId, String reportUid, List userIds) { if (userIds.isEmpty()) { return; } @@ -78,7 +98,7 @@ public class OaCcServiceImpl extends DefaultBaseService implements IOaCcService oaCcVO.setProcessInstanceId(processInstanceId); oaCcVO.setReportUid(reportUid); oaCcVO.setUserId(userId); - save(oaCcVO); + saveByUserId(saveUserId, oaCcVO); } } 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 e3b93ad5..24c73e15 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 @@ -139,7 +139,7 @@ public class OaFormReportRouteServiceImpl extends DefaultBaseService implements @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); + appShow(token, formCode, formVersion, httpSession, httpServletRequest, httpServletResponse); } @Override diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportServiceImpl.java index 30d01a0b..40477aea 100644 --- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportServiceImpl.java +++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportServiceImpl.java @@ -114,7 +114,7 @@ public class OaFormReportServiceImpl extends DefaultBaseService implements IOaFo // 保存表单日志 taskService.complete(task.getId(), params); LOG.debug("保存抄送"); - formCcService.save(formCode, formVersion, processInstance.getProcessInstanceId(), uid, oaFormReportUnWantedValueBO.getCcs()); + formCcService.saveByUserId(userId, formCode, formVersion, processInstance.getProcessInstanceId(), uid, oaFormReportUnWantedValueBO.getCcs()); } @Override @@ -136,7 +136,7 @@ public class OaFormReportServiceImpl extends DefaultBaseService implements IOaFo throw new SearchException("任务不存在或已被处理"); } OaFormReportUnWantedValueBO oaFormReportUnWantedValueBO = getOaFormReportUnWantedValue(params); - formReportService.update(formCode, formVersion, uid, params); + formReportService.updateByUserId(userId, formCode, formVersion, uid, params); if (isNeedClaim == 1) { LOG.debug("认领任务"); taskService.claim(taskId, userId); @@ -152,7 +152,7 @@ public class OaFormReportServiceImpl extends DefaultBaseService implements IOaFo // 保存表单日志 taskService.complete(taskId, params); LOG.debug("保存抄送"); - formCcService.save(formCode, formVersion, currentTask.getProcessInstanceId(), uid, oaFormReportUnWantedValueBO.getCcs()); + formCcService.saveByUserId(userId, formCode, formVersion, currentTask.getProcessInstanceId(), uid, oaFormReportUnWantedValueBO.getCcs()); } @Override diff --git a/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java b/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java index 73ac0f63..21ed8641 100644 --- a/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java +++ b/module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java @@ -15,46 +15,218 @@ import java.util.Map; */ public interface IFormReportService { + /** + * 新增 + * + * @param formCode + * @param formVersion + * @param params + */ void save(String formCode, Integer formVersion, Map params); + /** + * 新增 + * + * @param token + * @param formCode + * @param formVersion + * @param params + */ void saveByToken(String token, String formCode, Integer formVersion, Map params); + /** + * 新增 + * + * @param userId + * @param formCode + * @param formVersion + * @param params + */ void saveByUserId(String userId, String formCode, Integer formVersion, Map params); + /** + * 新增 + * + * @param formCode + * @param formVersion + * @param params + * @return id + */ String saveAndReturnId(String formCode, Integer formVersion, Map params); + /** + * 新增 + * + * @param token + * @param formCode + * @param formVersion + * @param params + * @return id + */ String saveByTokenAndReturnId(String token, String formCode, Integer formVersion, Map params); + /** + * 新增 + * + * @param userId + * @param formCode + * @param formVersion + * @param params + * @return id + */ String saveByUserIdAndReturnId(String userId, String formCode, Integer formVersion, Map params); + /** + * 删除 + * + * @param formCode + * @param formVersion + * @param uids + */ void remove(String formCode, Integer formVersion, List uids); + /** + * 更新 + * + * @param formCode + * @param formVersion + * @param uid + * @param params + */ void update(String formCode, Integer formVersion, String uid, Map params); + /** + * 更新 + * + * @param token + * @param formCode + * @param formVersion + * @param uid + * @param params + */ void updateByToken(String token, String formCode, Integer formVersion, String uid, Map params); + /** + * 更新 + * + * @param userId + * @param formCode + * @param formVersion + * @param uid + * @param params + */ void updateByUserId(String userId, String formCode, Integer formVersion, String uid, Map params); + /** + * 更新 + * + * @param creator + * @param modifier + * @param formCode + * @param formVersion + * @param uid + * @param params + */ void updateByCreatorAndModifier(String creator, String modifier, String formCode, Integer formVersion, String uid, Map params); + /** + * 更新流程实例 + * + * @param formCode + * @param formVersion + * @param uid + * @param processInstanceId + */ void updateProcessInstanceId(String formCode, Integer formVersion, String uid, String processInstanceId); + /** + * 详情 + * + * @param formCode + * @param formVersion + * @param uid + * @return + */ Map get(String formCode, Integer formVersion, String uid); + /** + * 详情 + * + * @param userId + * @param formCode + * @param formVersion + * @param uid + * @return + */ Map getByUserId(String userId, String formCode, Integer formVersion, String uid); + /** + * 列表 + * + * @param formCode + * @param formVersion + * @param params + * @return + */ List> list(String formCode, Integer formVersion, Map params); + /** + * 列表 + * + * @param userId + * @param formCode + * @param formVersion + * @param params + * @return + */ List> listByUserId(String userId, String formCode, Integer formVersion, Map params); + /** + * 分页列表 + * + * @param formCode + * @param formVersion + * @param page + * @return + */ SuccessResultList>> listPage(String formCode, Integer formVersion, ListPage page); + /** + * 分页列表 + * + * @param userId + * @param formCode + * @param formVersion + * @param page + * @return + */ SuccessResultList>> listPageByUserId(String userId, String formCode, Integer formVersion, ListPage page); + /** + * 分页列表（全部字段） + * + * @param formCode + * @param formVersion + * @param page + * @return + */ SuccessResultList>> listPageAllField(String formCode, Integer formVersion, ListPage page); + /** + * 显示字段列表 + * + * @param formCode + * @param formVersion + * @return + */ List listShowField(String formCode, Integer formVersion); + /** + * 统计 + * + * @param tableName + * @return + */ Integer count(String tableName); }