未符合项--查询优化
This commit is contained in:
+22
-4
@@ -34,10 +34,11 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@@ -75,9 +76,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
|
|||||||
ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
|
ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
|
||||||
}
|
}
|
||||||
// List<SysUser> sysUserList = sysUserService.list();
|
// List<SysUser> sysUserList = sysUserService.list();
|
||||||
QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
|
|
||||||
userQueryWrapper.select("id", "username");
|
|
||||||
List<SysUser> sysUserList = this.sysUserService.list(userQueryWrapper);
|
|
||||||
|
|
||||||
ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
|
ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
|
||||||
ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
|
ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
|
||||||
@@ -97,6 +96,25 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
|
|||||||
verifyName = "Verify conformance validation";
|
verifyName = "Verify conformance validation";
|
||||||
}
|
}
|
||||||
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
|
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
|
||||||
|
Set<String> userIdSet = new HashSet<>();
|
||||||
|
for (NcrTrackVO trackVO : infoList) {
|
||||||
|
if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
|
||||||
|
userIdSet.add(trackVO.getDesignInitiatorId());
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){
|
||||||
|
userIdSet.add(trackVO.getPrehomoInitiatorId());
|
||||||
|
}
|
||||||
|
if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
|
||||||
|
userIdSet.add(trackVO.getVerifyInitiatorId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
List<SysUser> sysUserList = new ArrayList<>();
|
||||||
|
if(userIdSet.size() != 0){
|
||||||
|
QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
|
||||||
|
userQueryWrapper.lambda().in(SysUser::getId,userIdSet);
|
||||||
|
userQueryWrapper.select("id", "username");
|
||||||
|
sysUserList = this.sysUserService.list(userQueryWrapper);
|
||||||
|
}
|
||||||
for (NcrTrackVO trackVO : infoList) {
|
for (NcrTrackVO trackVO : infoList) {
|
||||||
//责任领域中英文切换
|
//责任领域中英文切换
|
||||||
if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){
|
if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){
|
||||||
|
|||||||
Reference in New Issue
Block a user