Skip to content

A
amos-boot-zx-biz
Commit 3e4df50f authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

还款管理

parent ac340a09
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 81 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java
View file @ 3e4df50f
...@@ -135,11 +135,15 @@ public class CommonServiceImpl { ...@@ -135,11 +135,15 @@ public class CommonServiceImpl {
} }
public void deleteTaskModel(String id) { public void deleteTaskModel(String id) {
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult(); try {
if (!result.isEmpty()) { List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult();
List<Long> idList = result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList()); if (!result.isEmpty()) {
String ids = idList.stream().map(Object::toString).collect(Collectors.joining(",")); List<Long> idList = result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
taskV2FeignService.delete(ids); String ids = idList.stream().map(Object::toString).collect(Collectors.joining(","));
taskV2FeignService.delete(ids);
}
}catch (Exception e){
log.error(e.getMessage(),e);
} }
} }
...@@ -147,78 +151,82 @@ public class CommonServiceImpl { ...@@ -147,78 +151,82 @@ public class CommonServiceImpl {
* 待办新增接口 * 待办新增接口
**/ **/
public void buildTaskModel(List<TaskModelDto> list) { public void buildTaskModel(List<TaskModelDto> list) {
//执行人为空使用系统机器人账号 try {
if (StrUtil.isEmpty(RequestContext.getExeUserId())) { //执行人为空使用系统机器人账号
RequestContext.setExeUserId(amosRequestContext.getUserId()); if (StrUtil.isEmpty(RequestContext.getExeUserId())) {
RequestContext.setToken(amosRequestContext.getToken()); RequestContext.setExeUserId(amosRequestContext.getUserId());
RequestContext.setAgencyCode("JXIOP"); RequestContext.setToken(amosRequestContext.getToken());
} RequestContext.setAgencyCode("JXIOP");
List<TaskV2Model> taskV2Models = new ArrayList<>();
for (TaskModelDto obj : list) {
// 判断是否是暂存 新增若无下一节点执行人即为暂存
boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser());
if (flag) {
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(obj.getRelationId()).getResult();
if (CollectionUtil.isNotEmpty(result)) {
break;
}
}
//处理开始流程人员为空的问题
dealStartUser(obj);
TaskV2Model model = new TaskV2Model();
BeanUtil.copyProperties(obj, model);
String urlParams = "&formType=edit";
try {
urlParams = "&" + toQueryParams(obj.getModel());
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} }
List<Map> urlList = JsonUtils.getResourceList(urlInfo); List<TaskV2Model> taskV2Models = new ArrayList<>();
for (Map map : urlList) { for (TaskModelDto obj : list) {
if (map.get("type").equals(obj.getTaskCode())) { // 判断是否是暂存 新增若无下一节点执行人即为暂存
model.setRoutePath(map.get("url").toString() + urlParams); boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser());
break; if (flag) {
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(obj.getRelationId()).getResult();
if (CollectionUtil.isNotEmpty(result)) {
break;
}
} }
} //处理开始流程人员为空的问题
// 是true则为暂存 除公共部分统一处理 dealStartUser(obj);
if (flag) { TaskV2Model model = new TaskV2Model();
Object redisUserInfo = redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())); BeanUtil.copyProperties(obj, model);
if (Objects.isNull(redisUserInfo)) { String urlParams = "&formType=edit";
break; try {
urlParams = "&" + toQueryParams(obj.getModel());
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} }
ReginParams reginParams = JSONObject.parseObject(redisUserInfo.toString(), ReginParams.class); List<Map> urlList = JsonUtils.getResourceList(urlInfo);
model.setFlowStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode()); for (Map map : urlList) {
model.setFlowStatusLabel(FlowStatusEnum.TO_BE_SUBMITTED.getName()); if (map.get("type").equals(obj.getTaskCode())) {
model.setStartUserId(RequestContext.getExeUserId()); model.setRoutePath(map.get("url").toString() + urlParams);
model.setStartUser(reginParams.getUserModel().getRealName()); break;
model.setStartUserCompanyName(reginParams.getCompany().getCompanyName()); }
model.setStartDate(new Date()); }
model.setExecuteUserIds(RequestContext.getExeUserId()); // 是true则为暂存 除公共部分统一处理
model.setFlowCreateDate(new Date()); if (flag) {
model.setTaskStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode()); Object redisUserInfo = redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
model.setTaskTitle("有一条待提交的草稿"); if (Objects.isNull(redisUserInfo)) {
model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType())); break;
model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType())); }
// model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交"); ReginParams reginParams = JSONObject.parseObject(redisUserInfo.toString(), ReginParams.class);
model.setFlowStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
model.setFlowStatusLabel(FlowStatusEnum.TO_BE_SUBMITTED.getName());
model.setStartUserId(RequestContext.getExeUserId());
model.setStartUser(reginParams.getUserModel().getRealName());
model.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
model.setStartDate(new Date());
model.setExecuteUserIds(RequestContext.getExeUserId());
model.setFlowCreateDate(new Date());
model.setTaskStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
model.setTaskTitle("有一条待提交的草稿");
model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType()));
model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType()));
// model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
} else {
model.setTaskStatus(0);
model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
}
model.setFlowInstanceId(model.getRelationId());
model.setTaskSource("workFlow");
model.setExtras(JSON.toJSONString(obj.getModel()));
// model.setTerminal(params.getOrDefault("terminal","WEB").toString());
model.setCreateDate(new Date());
model.setRecUserId(RequestContext.getExeUserId());
model.setAgencyCode(RequestContext.getAgencyCode());
taskV2Models.add(model);
}
//如果使用的是机器人则使用机器人的token、appkey、product进行调用
if (amosRequestContext.getUserId().equals(RequestContext.getExeUserId())) {
taskV2FeignService.batchAddNew(amosRequestContext.getAppKey(), amosRequestContext.getProduct(), amosRequestContext.getToken(), taskV2Models);
} else { } else {
model.setTaskStatus(0); taskV2FeignService.batchAdd(taskV2Models);
model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
} }
model.setFlowInstanceId(model.getRelationId()); }catch (Exception e){
model.setTaskSource("workFlow"); log.error(e.getMessage(),e);
model.setExtras(JSON.toJSONString(obj.getModel()));
// model.setTerminal(params.getOrDefault("terminal","WEB").toString());
model.setCreateDate(new Date());
model.setRecUserId(RequestContext.getExeUserId());
model.setAgencyCode(RequestContext.getAgencyCode());
taskV2Models.add(model);
}
//如果使用的是机器人则使用机器人的token、appkey、product进行调用
if (amosRequestContext.getUserId().equals(RequestContext.getExeUserId())) {
taskV2FeignService.batchAddNew(amosRequestContext.getAppKey(), amosRequestContext.getProduct(), amosRequestContext.getToken(), taskV2Models);
} else {
taskV2FeignService.batchAdd(taskV2Models);
} }
} }
...@@ -397,15 +405,20 @@ public class CommonServiceImpl { ...@@ -397,15 +405,20 @@ public class CommonServiceImpl {
* @param businessTypeEnum * @param businessTypeEnum
*/ */
public void updateTaskModelAndAddTask(Object object, WorkflowResultDto workflowResultDto, BusinessTypeEnum businessTypeEnum) { public void updateTaskModelAndAddTask(Object object, WorkflowResultDto workflowResultDto, BusinessTypeEnum businessTypeEnum) {
Map<String, Object> updateTaskParam = new HashMap<>(); try {
updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode()); Map<String, Object> updateTaskParam = new HashMap<>();
updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName()); updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode()); updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName()); updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
updateTaskParam.put("model", object); updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
updateTaskParam.put("relationId", workflowResultDto.getInstanceId()); updateTaskParam.put("model", object);
updateTaskModel(updateTaskParam); updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
buildTaskModel((buildTaskModelDto(object, workflowResultDto, businessTypeEnum))); updateTaskModel(updateTaskParam);
buildTaskModel((buildTaskModelDto(object, workflowResultDto, businessTypeEnum)));
}catch (Exception e){
log.error(e.getMessage(),e);
}
} }
public JSONArray getRegionName() { public JSONArray getRegionName() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment