WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
wangzhijiang
2022-10-19 19:43:20 +08:00
parent 3fefe0198d
commit f6d498e0bf
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoDetailEOServiceImpl.java
+3
View File
@@ -18,6 +18,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
/** /**
* @Description: 流程信息明细表 * @Description: 流程信息明细表
@@ -26,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ProcessInfoDetailEOServiceImpl extends ServiceImpl<ProcessInfoDetailEOMapper, ProcessInfoDetailEO> implements IProcessInfoDetailEOService { public class ProcessInfoDetailEOServiceImpl extends ServiceImpl<ProcessInfoDetailEOMapper, ProcessInfoDetailEO> implements IProcessInfoDetailEOService {
/** /**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+17 -11
View File
@@ -32,6 +32,8 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
/** /**
* @Description: 流程信息表 * @Description: 流程信息表
@@ -40,6 +42,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, ProcessInfoEO> implements IProcessInfoEOService { public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, ProcessInfoEO> implements IProcessInfoEOService {
@Autowired @Autowired
@@ -305,18 +308,21 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
}).map(SysUser::getUsername).collect(Collectors.joining(",")); }).map(SysUser::getUsername).collect(Collectors.joining(","));
data.setLastAssigneeName(lastUserName); data.setLastAssigneeName(lastUserName);
} }
if(StringUtils.isNotEmpty(data.getAssignee())){ //如果流程没有结束，才可以展示当前处理人。
String[] assigneeArr = data.getAssignee().split(","); if(!StringUtils.equals(data.getStatus(),TodoCenterStatusEnum.COMPLETED.getValue())){
String currentUserName = sysUserList.stream().filter(sysUser -> { if(StringUtils.isNotEmpty(data.getAssignee())){
boolean flag = false; String[] assigneeArr = data.getAssignee().split(",");
for (String assignee : assigneeArr) { String currentUserName = sysUserList.stream().filter(sysUser -> {
if (StringUtils.equals(assignee, sysUser.getId())) { boolean flag = false;
flag = true; for (String assignee : assigneeArr) {
if (StringUtils.equals(assignee, sysUser.getId())) {
flag = true;
}
} }
} return flag;
return flag; }).map(SysUser::getUsername).collect(Collectors.joining(","));
}).map(SysUser::getUsername).collect(Collectors.joining(",")); data.setAssigneeName(currentUserName);
data.setAssigneeName(currentUserName); }
} }
} }
data.setProjectName(data.getProjectName() + "-" + data.getYearName()); data.setProjectName(data.getProjectName() + "-" + data.getYearName());