From f396cee26b27dece466ffd48a1659878151b1f54 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Fri, 13 Sep 2024 21:14:21 +0800
Subject: [PATCH] 返回建立的监理单位的用户集合
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 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 20f9585..0aabb1c 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
@@ -66,15 +66,37 @@
@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 ->{
+ Long proframId = s.getProframId();
+ SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
+ String controlUnit = sgProjectInfoDO.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ s.setUserIDs(users);
+ });
+
+ }
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 ->{
+ Long proframId = s.getProframId();
+ SgProjectInfoDO sgProjectInfoDO = sgProjectInfoMapper.selectById(proframId);
+ String controlUnit = sgProjectInfoDO.getControlUnit();
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ s.setUserIDs(users);
+ });
+
+ }
return page.setRecords(list);
}
@Override
@@ -191,20 +213,21 @@
// throw new ServiceException("请完成项目审批人员配置！");
// }
//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());
-// try {
-// Thread.sleep(100);
-// } catch (InterruptedException e) {
-// throw new RuntimeException(e);
-// }
+ //新增审批记录
+ sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).userId(sgProgressReportDO.getReportUser()).approvalContent("提交审批").roleId(Long.parseLong(AuthUtil.getUser().getRoleId())).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()).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()));
// sgProgressReportMapper.updateById(sgProgressReportDO);
// }
-// }
+ }
//加个项目及设备的状态判断 方便统计计算
if(gxStepId != 25 && gxStepId != 26 ) {
@@ -258,9 +281,23 @@
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);
+
+ //判断当前用户的角色是不是 工序配置的审核的角色
+
+ 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){
--
Gitblit v1.9.3