Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理问题

Browse Source
This commit is contained in:
wanggeng 2022-05-18 18:20:44 +08:00
parent 4fd2312a26
commit 3af54c3449
5 changed files with 216 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaCcService.java
View File

@ -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<String> userIds);
void saveByUserId(String userId, String formCode, Integer formVersion, String processInstanceId, String reportUid, List<String> userIds);
/**
* 更新阅读状态

24
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaCcServiceImpl.java
View File

@ -53,7 +53,27 @@ public class OaCcServiceImpl extends DefaultBaseService implements IOaCcService
}
@Override
public void save(String formCode, Integer formVersion, String processInstanceId, String reportUid, List<String> userIds) {
public void save(String token, OaCcVO oaCcVO) {
String formCcId = UUIDUtil.getUUID();
Map<String, Object> 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<String, Object> 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<String> 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);
}
}

2
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportRouteServiceImpl.java
View File

@ -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

6
module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaFormReportServiceImpl.java
View File

@ -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

172
module-form/src/main/java/ink/wgink/module/form/service/report/IFormReportService.java
View File

@ -15,46 +15,218 @@ import java.util.Map;
*/
public interface IFormReportService {
/**
* 新增
*
* @param formCode
* @param formVersion
* @param params
*/
void save(String formCode, Integer formVersion, Map<String, Object> params);
/**
* 新增
*
* @param token
* @param formCode
* @param formVersion
* @param params
*/
void saveByToken(String token, String formCode, Integer formVersion, Map<String, Object> params);
/**
* 新增
*
* @param userId
* @param formCode
* @param formVersion
* @param params
*/
void saveByUserId(String userId, String formCode, Integer formVersion, Map<String, Object> params);
/**
* 新增
*
* @param formCode
* @param formVersion
* @param params
* @return id
*/
String saveAndReturnId(String formCode, Integer formVersion, Map<String, Object> params);
/**
* 新增
*
* @param token
* @param formCode
* @param formVersion
* @param params
* @return id
*/
String saveByTokenAndReturnId(String token, String formCode, Integer formVersion, Map<String, Object> params);
/**
* 新增
*
* @param userId
* @param formCode
* @param formVersion
* @param params
* @return id
*/
String saveByUserIdAndReturnId(String userId, String formCode, Integer formVersion, Map<String, Object> params);
/**
* 删除
*
* @param formCode
* @param formVersion
* @param uids
*/
void remove(String formCode, Integer formVersion, List<String> uids);
/**
* 更新
*
* @param formCode
* @param formVersion
* @param uid
* @param params
*/
void update(String formCode, Integer formVersion, String uid, Map<String, Object> params);
/**
* 更新
*
* @param token
* @param formCode
* @param formVersion
* @param uid
* @param params
*/
void updateByToken(String token, String formCode, Integer formVersion, String uid, Map<String, Object> params);
/**
* 更新
*
* @param userId
* @param formCode
* @param formVersion
* @param uid
* @param params
*/
void updateByUserId(String userId, String formCode, Integer formVersion, String uid, Map<String, Object> 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<String, Object> 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<String, Object> get(String formCode, Integer formVersion, String uid);
/**
* 详情
*
* @param userId
* @param formCode
* @param formVersion
* @param uid
* @return
*/
Map<String, Object> getByUserId(String userId, String formCode, Integer formVersion, String uid);
/**
* 列表
*
* @param formCode
* @param formVersion
* @param params
* @return
*/
List<Map<String, Object>> list(String formCode, Integer formVersion, Map<String, Object> params);
/**
* 列表
*
* @param userId
* @param formCode
* @param formVersion
* @param params
* @return
*/
List<Map<String, Object>> listByUserId(String userId, String formCode, Integer formVersion, Map<String, Object> params);
/**
* 分页列表
*
* @param formCode
* @param formVersion
* @param page
* @return
*/
SuccessResultList<List<Map<String, Object>>> listPage(String formCode, Integer formVersion, ListPage page);
/**
* 分页列表
*
* @param userId
* @param formCode
* @param formVersion
* @param page
* @return
*/
SuccessResultList<List<Map<String, Object>>> listPageByUserId(String userId, String formCode, Integer formVersion, ListPage page);
/**
* 分页列表（全部字段）
*
* @param formCode
* @param formVersion
* @param page
* @return
*/
SuccessResultList<List<Map<String, Object>>> listPageAllField(String formCode, Integer formVersion, ListPage page);
/**
* 显示字段列表
*
* @param formCode
* @param formVersion
* @return
*/
List<String> listShowField(String formCode, Integer formVersion);
/**
* 统计
*
* @param tableName
* @return
*/
Integer count(String tableName);
}