Merge pull request 'fix: 修改任务终审' (#137) from fix/updateCheckRepetition20240418 into test

Reviewed-on: #137

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -583,6 +583,7 @@ 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<String> taskIds = taskList.stream().map(Task::getId).collect(Collectors.toList());
                 List<String> taskNames = taskList.stream().map(Task::getName).collect(Collectors.toList());
@@ -604,8 +605,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());
+                String[] split = formData.getAssignee().split(",");
-                userFinalService.save(user.getId().toString(), formId);
+                List<cn.jyjz.xiaoyao.common.base.vo.User> userList = userTokenService.findByLoginNameList(split);
+                userFinalService.save(userList, formId);
             }
             this.sendMsg(childPicture, userToken);
 

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<UserFinal>  {
      * @param formid 业务表单主键
      * @return 成功返回true，否则返回false
      */
-    public boolean save(String userid,String formid);
+    public boolean save(List<User> userid, String formid);
 }

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<UserFinalMybatisDao, UserFinal>  implements UserFinalService {
+public class UserFinalServiceImpl extends BaseServiceImpl<UserFinalMybatisDao, UserFinal> implements UserFinalService {
-	@Autowired
+    @Autowired
-	private UserFinalMybatisDao userFinalMybatisDao;
+    private UserFinalMybatisDao userFinalMybatisDao;
-	
+
-	@Override
+    @Override
-	public boolean save(String userid, String formid) {
+    public boolean save(List<User> userid, String formid) {
-		
+        //判断是否存在重复表单主键
-		//判断是否存在重复表单主键
+        QueryWrapper queryWrapper = new QueryWrapper();
-		QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("FORMID", formid);
-		queryWrapper.eq("FORMID",formid);
+        Long listcount = count(queryWrapper);
-		Long listcount = count(queryWrapper);
+        if (listcount.intValue() > 0) {
-		if(listcount.intValue() > 0 ){
+            return true;
-			return true;
+        }
-		}
+        List<UserFinal> list = new ArrayList<>();
-		
+        for (User user : userid) {
-		UserFinal userFinal = new UserFinal();
+            UserFinal userFinal = new UserFinal();
-		userFinal.setUserid(Long.parseLong(userid));
+            userFinal.setUserid(user.getId());
-		userFinal.setFormid(Long.parseLong(formid));
+            userFinal.setFormid(Long.parseLong(formid));
-		
+            list.add(userFinal);
-		return this.save(userFinal);
+        }
-	}
+        return this.saveBatch(list);
+    }
 }