liux
/
nxdt-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: liux:4ec7bd6e9802a045f1fbfac0e6d5fae1a3f6d006
Branches Tags
liux:master
..
compare: liux:72b53ce4760f0a512ee40c8eefa5fb528c6064c4
Branches Tags
liux:master

No commits in common. "4ec7bd6e9802a045f1fbfac0e6d5fae1a3f6d006" and "72b53ce4760f0a512ee40c8eefa5fb528c6064c4" have entirely different histories.
4ec7bd6e98 ... 72b53ce476

3 changed files with 1 additions and 35 deletions
Show Stats Expand all files Collapse all files

5
bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SubPerson.java
View File

@ -151,9 +151,4 @@ public class SubPerson extends BaseBean implements Serializable {
private String annotation = "0";
private String isExistFile;
private List<String> userList;
private String taskType;
}

25
bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SubServiceImpl.java
View File

@ -2,7 +2,6 @@ package com.bonus.project.service.impl;
import com.bonus.common.core.domain.MsgBean;
import com.bonus.common.core.domain.RequestEntity;
import com.bonus.common.core.utils.PageUtils;
import com.bonus.common.core.utils.StaticVariableUtils;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.core.web.domain.AjaxResult;
@ -25,9 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@ -157,28 +154,10 @@ public class SubServiceImpl implements SubService {
*/
@Override
public List<SubPerson> enterPersonList(SubPerson bean) {
long startTime = System.currentTimeMillis();
RequestEntity entity = new RequestEntity();
entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
AjaxResult ajaxResult = flowTaskService.getStayFlow(entity);
List<String> stringList = new ArrayList<>();
if (ajaxResult.isSuccess() ) {
List<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
if (data != null && !data.isEmpty()) {
if (data != null && !data.isEmpty()) {
stringList = data.stream()
.map(map -> (String) map.get("proInsId"))
.collect(Collectors.toList());
}
}
}
bean.setUserList(stringList);
PageUtils.startPage();
List<SubPerson> list = mapper.enterPersonList(bean);
System.err.println("stringList="+stringList);
// RequestEntity entity = new RequestEntity();
RequestEntity entity = new RequestEntity();
entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
// 创建一个 GenericProcessor 实例 对审批流程数据进行处理
GenericProcessor processor = new GenericProcessor();
@ -188,8 +167,6 @@ public class SubServiceImpl implements SubService {
.filter(subPerson -> bean.getStatus().equals(subPerson.getIntoStatus()))
.collect(Collectors.toList());
}
long endTime = System.currentTimeMillis();
System.err.println("耗时："+(endTime-startTime));
return list;
}

6
bonus-modules/bonus-project/src/main/resources/mapper/system/SubMapper.xml
View File

@ -140,12 +140,6 @@
and lcp.out_status = #{status}
</if>
</if>
<if test="userList != null and userList !='' ">
and lcp.proc_inst_id in
<foreach collection="userList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="checkIsExistPersonName" resultType="com.bonus.system.api.domain.SysUser">
SELECT user_id as userId,