diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java index 234a149b..6ad7bbac 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java @@ -490,13 +490,13 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask OcrTaskchildPicture childPicture = ocrTaskchildPictureService.getById(Long.parseLong(formId)); Task taskData = null; if (null != taskList && !taskList.isEmpty()) { + taskData = taskList.get(0); if (taskList.size() > 1) { List taskIds = taskList.stream().map(Task::getId).collect(Collectors.toList()); List taskNames = taskList.stream().map(Task::getName).collect(Collectors.toList()); childPicture.setTaskId(String.join(",", taskIds)); childPicture.setTaskname(String.join(",", taskNames)); } else { - taskData = taskList.get(0); childPicture.setTaskId(taskData.getId()); childPicture.setTaskname(taskData.getName()); } @@ -511,8 +511,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask //判断节点上的描述字段,是否伟finale_judgment,如果是,记录到终审表中,如果终审表已经存在,不再重复记录 if (StringUtils.isNotBlank(taskData.getDescription()) && taskData.getDescription().equals(SystemConstantsOa.OA_TASK_COMPLETE_FINALE_FORM)) { childPicture.setIsFinal(1); - User user = userService.findByLoginname(formData.getAssignee()); - userFinalService.save(user.getId().toString(), formId); + String[] split = formData.getAssignee().split(","); + List userList = userTokenService.findByLoginNameList(split); + userFinalService.save(userList, formId); } this.sendMsg(childPicture, userToken); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/UserFinalService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/UserFinalService.java index d08185fa..eb19cb5b 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/UserFinalService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/UserFinalService.java @@ -1,7 +1,11 @@ package cn.jyjz.xiaoyao.oa.from.service; +import cn.jyjz.xiaoyao.common.base.vo.User; import cn.jyjz.xiaoyao.oa.from.dataobject.UserFinal; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseService; + +import java.util.List; + /** * 业务层 */ @@ -13,5 +17,5 @@ public interface UserFinalService extends BaseService { * @param formid 业务表单主键 * @return 成功返回true,否则返回false */ - public boolean save(String userid,String formid); + public boolean save(List userid, String formid); } diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserFinalServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserFinalServiceImpl.java index 4e3ed1d3..d2768103 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserFinalServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/oa/from/service/impl/UserFinalServiceImpl.java @@ -1,40 +1,44 @@ package cn.jyjz.xiaoyao.oa.from.service.impl; +import cn.jyjz.xiaoyao.common.base.vo.User; import cn.jyjz.xiaoyao.oa.from.dataDao.UserFinalMybatisDao; import cn.jyjz.xiaoyao.oa.from.dataobject.UserFinal; -import cn.jyjz.xiaoyao.oa.from.dataobject.Userapprove; import cn.jyjz.xiaoyao.oa.from.service.UserFinalService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import cn.jyjz.xiaoyao.common.mybatisplus.base.BaseServiceImpl; import lombok.extern.slf4j.Slf4j; + +import java.util.ArrayList; import java.util.List; + /** -* 业务层实现 -*/ + * 业务层实现 + */ @Service @Slf4j -public class UserFinalServiceImpl extends BaseServiceImpl implements UserFinalService { - @Autowired - private UserFinalMybatisDao userFinalMybatisDao; - - @Override - public boolean save(String userid, String formid) { - - //判断是否存在重复表单主键 - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("FORMID",formid); - Long listcount = count(queryWrapper); - if(listcount.intValue() > 0 ){ - return true; - } - - UserFinal userFinal = new UserFinal(); - userFinal.setUserid(Long.parseLong(userid)); - userFinal.setFormid(Long.parseLong(formid)); - - return this.save(userFinal); - } +public class UserFinalServiceImpl extends BaseServiceImpl implements UserFinalService { + @Autowired + private UserFinalMybatisDao userFinalMybatisDao; + + @Override + public boolean save(List userid, String formid) { + //判断是否存在重复表单主键 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("FORMID", formid); + Long listcount = count(queryWrapper); + if (listcount.intValue() > 0) { + return true; + } + List list = new ArrayList<>(); + for (User user : userid) { + UserFinal userFinal = new UserFinal(); + userFinal.setUserid(user.getId()); + userFinal.setFormid(Long.parseLong(formid)); + list.add(userFinal); + } + return this.saveBatch(list); + } }