From 0aa9af7bc8e34d539c990c5d714e24092a2d53e7 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 20 Sep 2024 17:35:24 +0800
Subject: [PATCH] 湖北水库：水库分页接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 328 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 255 insertions(+), 73 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
index b783ea2..83ef140 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -3,10 +3,7 @@
import cn.gistack.sm.sg.DO.*;
import cn.gistack.sm.sg.DTO.ApprovalDTO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
-import cn.gistack.sm.sg.VO.SgProgressReportVO;
-import cn.gistack.sm.sg.VO.SgProjectInfoVO;
-import cn.gistack.sm.sg.VO.SgReportVO;
-import cn.gistack.sm.sg.VO.SgStepReportVO;
+import cn.gistack.sm.sg.VO.*;
import cn.gistack.sm.sg.mapper.*;
import cn.gistack.sm.sg.service.SgProgressReportService;
import cn.gistack.sm.sg.service.SgProjectInfoService;
@@ -19,6 +16,7 @@
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
@@ -66,15 +64,81 @@
@Autowired
private SgProjectInfoServiceImpl sgProjectInfoService;
+
+
ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
@Override
public IPage<SgProgressReportVO> queryPageList(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageList(page,searchDTO);
+ if(list != null){
+ list.forEach(s ->{
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
+ });
+
+ }
return page.setRecords(list);
}
@Override
public IPage<SgProgressReportVO> queryPageListAll(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(page,searchDTO);
+ if(list != null){
+ list.forEach(s ->{
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
+ });
+
+ }
return page.setRecords(list);
}
@Override
@@ -174,8 +238,10 @@
SgDeviceDO sgDeviceDO = new SgDeviceDO();
if (gxDeviceId == 999){
deviceType = "sgzb";
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
}else if(gxDeviceId == 998){
deviceType = "sgys";
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
}else {
sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId);
deviceType = sgDeviceDO.getDeviceType();
@@ -186,22 +252,25 @@
if (CollectionUtils.isEmpty(roIds)){
throw new ServiceException("请完成工序角色配置！");
}
- List<SgProjectPersonConfigDO> personConfigDOS = new LambdaQueryChainWrapper<>(sgProjectPersonConfigMapper).eq(SgProjectPersonConfigDO::getProgramId,sgProgressReportDO.getProframId()).in(SgProjectPersonConfigDO::getRoldId, roIds).list();
- if (CollectionUtils.isEmpty(personConfigDOS)){
- throw new ServiceException("请完成项目审批人员配置！");
+// List<SgProjectPersonConfigDO> personConfigDOS = new LambdaQueryChainWrapper<>(sgProjectPersonConfigMapper).eq(SgProjectPersonConfigDO::getProgramId,sgProgressReportDO.getProframId()).in(SgProjectPersonConfigDO::getRoldId, roIds).list();
+// if (CollectionUtils.isEmpty(personConfigDOS)){
+// throw new ServiceException("请完成项目审批人员配置！");
+// }
+ //Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
+ //新增审批记录
+ if (gxDeviceId != 998 && gxDeviceId != 999){
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).approvalStatus(0).approvalOrder(0).approvalTime(now).build());
}
- Map<Long, Long> userMap = personConfigDOS.stream().collect(Collectors.toMap(SgProjectPersonConfigDO::getRoldId, SgProjectPersonConfigDO::getUserId));
- sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").approvalStatus(0).approvalOrder(0).approvalTime(now).build());
for (SgGxConfigDO sgGxConfigDO : sgGxConfigDOS) {
- sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
- sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgGxConfigDO.getUser()).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
+ //sgGxConfigDO.setUser(userMap.get(Long.parseLong(sgGxConfigDO.getRoleId())));
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong(sgGxConfigDO.getRoleId())).approvalStatus(0).approvalOrder(sgGxConfigDO.getSgOrder()).build());
try {
Thread.sleep(100);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
if (sgGxConfigDO.getSgOrder() == 1) {
- sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getUser()));
+ sgProgressReportDO.setAuditPerson(String.valueOf(sgGxConfigDO.getRoleId()));
sgProgressReportMapper.updateById(sgProgressReportDO);
}
}
@@ -230,9 +299,12 @@
sgProgressReportVO.setDeviceName(sgDeviceDO.getDeviceName());
}else {
sgProgressReportVO.setDeviceName("");}
- List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getId).list();
- List<Long> ids = list.stream().map(s -> s.getUserId()).collect(Collectors.toList());
+ List<SgReportUserDO> list = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalOrder).list();
+ List<Long> ids = list.stream().map(SgReportUserDO::getUserId).collect(Collectors.toList());
+ List<Long> rids = list.stream().map(SgReportUserDO::getRoleId).collect(Collectors.toList());
List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
+ List<Map<String,Object>> roles = sgProgressReportMapper.getRoleByIds(rids);
+
for (Map<String, Object> user : users) {
for (SgReportUserDO sgReportUserDO : list) {
if (user.get("ID").equals(sgReportUserDO.getUserId())){
@@ -241,9 +313,34 @@
}
}
}
+ for (Map<String, Object> r : roles) {
+ for (SgReportUserDO sgReportUserDO : list) {
+ if (r.get("ID").equals(sgReportUserDO.getRoleId())){
+ sgReportUserDO.setRoleName(r.get("ROLENAME").toString());
+ }
+ }
+ }
sgProgressReportVO.setSgReportUserDOS(list);
List<SgStepReportVO> sgStepReportVOS = sgProgressReportMapper.selectByDeviceId(sgProgressReportVO.getGxDeviceId());
+ sgStepReportVOS = sgStepReportVOS.stream().filter(s -> s.getApprovalStatus() == null || (s.getApprovalStatus() != 4 && !(s.getApprovalStatus() == 3 && s.getResubmit() != 0))).collect(Collectors.toList());
sgProgressReportVO.setSgStepReportVOS(sgStepReportVOS);
+
+ if(sgProgressReportVO.getControlUnit()!=null){
+ String controlUnit = sgProgressReportVO.getControlUnit();
+ List<String> users1=sgProjectInfoMapper.getUserS(controlUnit);
+ sgProgressReportVO.setUserIDs(users1);
+ }
+ String gxStepName = sgProgressReportVO.getGxStepName();
+ String countyCd = sgProgressReportVO.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ sgProgressReportVO.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
return sgProgressReportVO;
}
@@ -257,15 +354,33 @@
Integer isReject = approvalDTO.getIsReject();
Long userId = approvalDTO.getUserId();
Long id = approvalDTO.getId();
+ String roleId = AuthUtil.getUser().getRoleId();
+ QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
+ wrappers.eq("id", id);
+ SgProgressReportDO sgProgressReportDOS1 = sgProgressReportMapper.selectOne(wrappers);
+
+ //判断当前用户的角色是不是 工序配置的审核的角色
+ Long gxDeviceId = sgProgressReportDOS1.getGxDeviceId();
+ if (gxDeviceId != 998 && gxDeviceId != 999) {
+ List<SgGxConfigDO> sgGxConfigDOS = new LambdaQueryChainWrapper<>(sgGxConfigMapper)
+// .eq(SgGxConfigDO::getGxDeviceType, sgProgressReportDOS1.getDeviceType())
+ .eq(SgGxConfigDO::getGxStepId, sgProgressReportDOS1.getGxStepId()).orderByAsc(SgGxConfigDO::getSgOrder).list();
+ List<String> roIds = sgGxConfigDOS.stream().map(SgGxConfigDO::getRoleId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(roIds)){
+ throw new ServiceException("请完成工序角色配置！");
+ }
+ }
SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectById(id);
List<SgReportUserDO> sgReportUserDOS = new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId, id).ne(SgReportUserDO::getApprovalOrder,0).eq(SgReportUserDO::getIsHis,0)
.orderByAsc(SgReportUserDO::getApprovalOrder).list();
+
//审批者
SgReportUserDO sgReportUserDO = new SgReportUserDO();
- if (isReject==1 && sgProgressReportDO.getStatus().equals(2)){
- sgReportUserDO = sgReportUserDOS.get(0);
+ if (isReject==1){
+ sgReportUserDO = SgReportUserDO.builder().reportId(approvalDTO.getId()).approvalOrder(sgReportUserDOS.get(sgReportUserDOS.size() - 1).getApprovalOrder()+1).roleId(Long.valueOf(roleId)).build();
+ sgReportUserMapper.insert(sgReportUserDO);
}else {
- sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getUserId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
+ sgReportUserDO = sgReportUserDOS.stream().filter(s -> s.getRoleId().equals(Long.parseLong(sgProgressReportDO.getAuditPerson()))).findFirst().get();
}
Date date = new Date();
LambdaUpdateChainWrapper<SgProgressReportDO> updateChainWrapper = new LambdaUpdateChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getId, id);
@@ -273,64 +388,32 @@
.eq(SgReportUserDO::getId, sgReportUserDO.getId()).set(SgReportUserDO::getApprovalContent,approvalDTO.getApprovalContent()).set(SgReportUserDO::getApprovalTime,date);
if (approvalDTO.getStatus()==1){
Integer approvalOrder = sgReportUserDO.getApprovalOrder();
- userUpdate.set(SgReportUserDO::getApprovalStatus,1).update();
+ userUpdate.set(SgReportUserDO::getApprovalStatus,1).set(SgReportUserDO::getUserId,userId).update();
Optional<SgReportUserDO> next = sgReportUserDOS.stream().filter(s -> s.getApprovalOrder() == approvalOrder + 1).findFirst();
//如果存在下一个审批人，则继续审批
if (next.isPresent()){
SgReportUserDO nextUser = next.get();
- updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getUserId()).update();
+ updateChainWrapper.set(SgProgressReportDO::getStatus,1).set(SgProgressReportDO::getAuditPerson,nextUser.getRoleId()).update();
}else {
updateChainWrapper.set(SgProgressReportDO::getStatus,2).set(SgProgressReportDO::getAuditPerson,null).update();
Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
//工序审核完成后 进行项目和设备状态的判断
- cachedThreadPool.execute(new Runnable(){
- @Override
- public void run(){
+// cachedThreadPool.execute(new Runnable(){
+// @Override
+// public void run(){
setProgramAndDeviceStatus(proframId);
-
- }
- });
- cachedThreadPool.execute(new Runnable(){
- @Override
- public void run(){
- Long proframId = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
- setProgramProgress(proframId);
- }
- });
+//
+// }
+// });
+ Long projectID = sgProgressReportMapper.selectById(approvalDTO.getId()).getProframId();
+ setProgramProgress(projectID);
}
}else {
updateChainWrapper.set(SgProgressReportDO::getStatus,3);
updateChainWrapper.set(SgProgressReportDO::getResubmit,0);
userUpdate.set(SgReportUserDO::getApprovalStatus,2);
- /*if (isReject==1){
- userUpdate.set(SgReportUserDO::getUserId,userId);
- }*/
+ userUpdate.set(SgReportUserDO::getUserId,userId);
userUpdate.update();
- /*for (SgReportUserDO reportUserDO : sgReportUserDOS) {
- if (reportUserDO.getApprovalOrder()<=sgReportUserDO.getApprovalOrder()&&reportUserDO.getApprovalOrder()!=0){
- //更新为历史数据
- new LambdaUpdateChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getId,reportUserDO.getId()).set(SgReportUserDO::getIsHis,1).update();
- setReportUser(date, reportUserDO);
- sgReportUserMapper.insert(reportUserDO);
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }else if (reportUserDO.getApprovalOrder()>sgReportUserDO.getApprovalOrder()){
- sgReportUserMapper.deleteById(reportUserDO.getId());
- setReportUser(date, reportUserDO);
- sgReportUserMapper.insert(reportUserDO);
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
- if (reportUserDO.getApprovalOrder()==1){
- updateChainWrapper.set(SgProgressReportDO::getAuditPerson,reportUserDO.getUserId());
- }
- }*/
updateChainWrapper.update();
}
@@ -342,12 +425,14 @@
* @param proframId
*/
public void setProgramProgress(Long proframId) {
- SgProjectInfoVO sgProjectInfoVO = sgProjectInfoMapper.selectVOById(proframId);
- List<SgProjectInfoDO> progress = sgProjectInfoService.getProjectProgress(Collections.singletonList(sgProjectInfoVO));
+ ProjectSearchDTO searchDTO = new ProjectSearchDTO();
+ searchDTO.setProjectId(String.valueOf(proframId));
+ List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(searchDTO);
+ List<SgProjectInfoDO> progress = sgProjectInfoService.getProjectProgress(list);
String projectProgress = progress.get(0).getProjectProgress();
if (StringUtils.isNotBlank(projectProgress)){
String s = projectProgress.substring(0, projectProgress.length() - 1);
- new LambdaUpdateChainWrapper<>(sgProjectInfoMapper).set(SgProjectInfoDO::getProjectProgress,s).update() ;
+ new LambdaUpdateChainWrapper<>(sgProjectInfoMapper).set(SgProjectInfoDO::getProjectProgress,s).eq(SgProjectInfoDO::getId,proframId).update() ;
}
}
private void setReportUser(Date date, SgReportUserDO reportUserDO) {
@@ -400,7 +485,19 @@
sgProjectInfoMapper.updateById(project);
}
}
-
+ Map<String, SgOperatingRateVO> deviceTypes = sgProjectInfoService.getDeviceTypes(Arrays.asList(projectId.toString()));
+ SgOperatingRateVO vo = deviceTypes.get(projectId.toString());
+ if (Objects.nonNull(vo)){
+ project.setSurfaceProgress(vo.getSurfaceProgress());
+ project.setSurfaceNum(vo.getSurfaceNum());
+ project.setVideoProgress(vo.getVideoProgress());
+ project.setVideoNum(vo.getVideoNum());
+ project.setTransProgress(vo.getTransProgress());
+ project.setTransNum(vo.getTransNum());
+ project.setSeepageProgress(vo.getSeepageProgress());
+ project.setSeepageNum(vo.getSeepageNum());
+ sgProjectInfoMapper.updateById(project);
+ }
}
}
@@ -413,17 +510,64 @@
@Override
public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
- Long userId = AuthUtil.getUserId();
- searchDTO.setUserId(userId);
+ BladeUser user = AuthUtil.getUser();
+ if(!user.getRoleId().equals("1811657352658042882")){
+
+ searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
+ }
+ searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+ //searchDTO.setUserId(userId);
List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
+ if(list != null){
+ list.forEach(s ->{
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
+ });
+
+ }
return list;
}
@Override
public Map<String, Long> countList(ProjectSearchDTO searchDTO) {
- Long userId = AuthUtil.getUserId();
- searchDTO.setUserId(userId);
- searchDTO.setAuditPerson(userId.toString());
+ BladeUser user = AuthUtil.getUser();
+ if(!user.getRoleId().equals("1811657352658042882")){
+
+ searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
+ }
+
+ searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+ //searchDTO.setUserId(userId);
+ //searchDTO.setAuditPerson(userId.toString());
List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO);
searchDTO.setApprovalStatus(0);
List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO);
@@ -496,12 +640,50 @@
@Override
public IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
- Long userId = AuthUtil.getUserId();
- searchDTO.setUserId(userId);
- if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
- searchDTO.setAuditPerson(String.valueOf(userId));
+ BladeUser user = AuthUtil.getUser();
+ //判断是不是县级建办 否的话就是监理单位下人员进行
+ if(!user.getRoleId().equals("1811657352658042882")){
+ searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
+ }else{
+ searchDTO.setCountryUnit(Long.parseLong(user.getDeptId()));
}
+ searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
+// if (searchDTO.getApprovalStatus()!=null && searchDTO.getApprovalStatus() ==0){
+// searchDTO.setAuditPerson(String.valueOf(userId));
+// }
List<SgProgressReportVO> list = sgProgressReportMapper.queryList(page, searchDTO);
+ if(list != null){
+ list.forEach(s ->{
+ List<String> resultUsers=new ArrayList<>();
+ if(s.getControlUnit()!=null){
+ String controlUnit = s.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ resultUsers.addAll(users);
+ }
+// if(s.getSelfUnit()!=null){
+// String selfUnit = s.getSelfUnit().toString();
+// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
+// resultUsers.addAll(selfUnitusers);
+// }
+
+
+ s.setUserIDs(resultUsers);
+ String gxStepName = s.getGxStepName();
+ String countyCd = s.getCountyCd();
+
+ if("测量定位".equals(gxStepName)){
+
+ if(countyCd!=null){
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ s.setXbUnitIDs(xbUnitIDs);
+ }
+
+ }
+
+
+ });
+
+ }
return page.setRecords(list);
}
--
Gitblit v1.9.3