diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java index af43718f..6434be4f 100644 --- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java +++ b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/service/UserTokenService.java @@ -5,6 +5,7 @@ import cn.jyjz.xiaoyao.common.base.vo.User; import cn.jyjz.xiaoyao.common.base.vo.UserToken; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -23,6 +24,8 @@ public interface UserTokenService { */ User findByLoginname(String loginname); + List findByLoginNameList(String[] loginname); + /** * 查询用户对象 * @param phone 登录手机号 diff --git a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java index f4674917..dd402c1a 100644 --- a/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java +++ b/jyjz-system/jyjz-system-admin/src/main/java/cn/jyjz/xiaoyao/admin/service/impl/UserTokenServiceImpl.java @@ -26,10 +26,8 @@ import cn.jyjz.xiaoyao.common.base.exception.MyTokenExpiredException; import cn.jyjz.xiaoyao.framework.security.model.AdminUserModel; import cn.jyjz.xiaoyao.framework.security.service.FlowableUserLoginService; import cn.jyjz.xiaoyao.framework.security.utils.JwtUtils; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; + +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -102,6 +100,16 @@ public class UserTokenServiceImpl implements UserTokenService { return user; } + @Override + public List findByLoginNameList(String[] loginname) { + List userList = new ArrayList<>(); + for (String userName : loginname) { + User user = this.findByLoginname(userName); + userList.add(user); + } + return userList; + } + public User findByPhone(String phone) { cn.jyjz.xiaoyao.admin.dataobject.User userData = userService.findByPhone(phone); 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 c875b9e9..c37eed68 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 @@ -558,30 +558,34 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask //发送消息 public void sendMsg(OcrTaskchildPicture model, UserToken userToken) { - cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(model.getAssignee()); - OcrMsg msg = new OcrMsg(); - msg.setCreateTime(System.currentTimeMillis()); - msg.setSendTime(System.currentTimeMillis()); - msg.setReceiveUserIds(byLoginname.getId().toString()); - msg.setTitile(model.getFromtaskname()); - msg.setSender(Long.valueOf(userToken.getUserid())); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("taskId", model.getFromtaskid()); - jsonObject.put("nodeName", model.getTaskname()); - jsonObject.put("states", 1); - jsonObject.put("statesName", "待审批"); - jsonObject.put("sendUserId", userToken.getUserid()); - jsonObject.put("sendUserName", userToken.getUsername()); - jsonObject.put("sendTime", System.currentTimeMillis()); - jsonObject.put("fromId", model.getId().toString()); - jsonObject.put("taskName", model.getFromtaskname()); - jsonObject.put("pictureId", model.getPictureid()); - jsonObject.put("packageId", model.getPackageid()); - msg.setBusJson(jsonObject.toJSONString()); - msg.setCreateBy(Long.valueOf(userToken.getUserid())); - msg.setCreateTime(System.currentTimeMillis()); - msg.setSendStatus("1"); - ocrMsgService.save(msg); + String[] split = model.getAssignee().split(","); + List userList = userTokenService.findByLoginNameList(split); + for (cn.jyjz.xiaoyao.common.base.vo.User user : userList) { + OcrMsg msg = new OcrMsg(); + msg.setCreateTime(System.currentTimeMillis()); + msg.setSendTime(System.currentTimeMillis()); + msg.setReceiveUserIds(user.getId().toString()); + msg.setTitile(model.getFromtaskname()); + msg.setSender(Long.valueOf(userToken.getUserid())); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("taskId", model.getFromtaskid()); + jsonObject.put("nodeName", model.getTaskname()); + jsonObject.put("states", 1); + jsonObject.put("statesName", "待审批"); + jsonObject.put("sendUserId", userToken.getUserid()); + jsonObject.put("sendUserName", userToken.getUsername()); + jsonObject.put("sendTime", System.currentTimeMillis()); + jsonObject.put("fromId", model.getId().toString()); + jsonObject.put("taskName", model.getFromtaskname()); + jsonObject.put("pictureId", model.getPictureid()); + jsonObject.put("packageId", model.getPackageid()); + msg.setBusJson(jsonObject.toJSONString()); + msg.setCreateBy(Long.valueOf(userToken.getUserid())); + msg.setCreateTime(System.currentTimeMillis()); + msg.setSendStatus("1"); + ocrMsgService.save(msg); + } + } /** diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java index 139ea73c..fb0fd229 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/ApiTestController.java @@ -127,7 +127,7 @@ public class ApiTestController { PictureSourceParameter pictureSourceParameter = new PictureSourceParameter(); pictureSourceParameter.setPageSize(Integer.parseInt(pageSize)); pictureSourceParameter.setTenantNo(1714548920583360512L); - pictureSourceParameter.setAccountNo(1714887674875514880L); + pictureSourceParameter.setAccountNo(1714559323824623616L); List notAddedToQueueTaskIds = new ArrayList<>(); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index 6443c4e5..e4c9955e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -239,7 +239,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl UNION - select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat,tc.is_repeated_nodules as isRepeatedNodules + select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat, tc.is_repeated_nodules as isRepeatedNodules from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op where tc.ID = uf.FORMID and tc.PICTUREID = op.ID @@ -686,7 +686,7 @@ from ocr_taskchild_picture tc LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID left join ocr_picture op on tc.PICTUREID = op.ID - where tc.ASSIGNEE = #{searchassignee} + where FIND_IN_SET(#{searchassignee}, tc.ASSIGNEE) and tc.TENANTID = #{searchtenantid} and tc.STATES = 2 and op.suspiciousfile = 0