From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java | 169 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 127 insertions(+), 42 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 9af9a4b..6d5d124 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
@@ -64,6 +64,9 @@
@Autowired
private SgProjectInfoServiceImpl sgProjectInfoService;
+ @Autowired
+ private SgGxMapper sgGxMapper;
+
ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
@@ -75,14 +78,16 @@
List<String> resultUsers=new ArrayList<>();
if(s.getControlUnit()!=null){
String controlUnit = s.getControlUnit();
- List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -92,7 +97,8 @@
if("测量定位".equals(gxStepName)){
if(countyCd!=null){
- List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ List<String> controlUnitS = Arrays.asList(countyCd.split(","));
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
s.setXbUnitIDs(xbUnitIDs);
}
@@ -106,20 +112,26 @@
}
@Override
public IPage<SgProgressReportVO> queryPageListAll(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO) {
+ if (StringUtils.isNotBlank(searchDTO.getTypeName())){
+ List<String> childType = sgGxMapper.childType(searchDTO.getTypeName());
+ searchDTO.setChildTypeList(childType);
+ }
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);
+ List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -129,7 +141,8 @@
if("测量定位".equals(gxStepName)){
if(countyCd!=null){
- List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ List<String> controlUnitS = Arrays.asList(countyCd.split(","));
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
s.setXbUnitIDs(xbUnitIDs);
}
@@ -168,7 +181,7 @@
}
QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
- wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "施工准备");
+ wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "测量定位");
List<SgProgressReportDO> sgProgressReportDOS1 = sgProgressReportMapper.selectList(wrappers);
if(sgProgressReportDO.getGxDeviceId()==998){
@@ -190,11 +203,11 @@
if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3) {
- throw new ServiceException("请先完成施工准备的审批!");
+ throw new ServiceException("请先完成测量定位的审批!");
}
}
- } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("施工准备"))) {
- throw new ServiceException("请先发起施工准备的审批!");
+ } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("测量定位"))) {
+ throw new ServiceException("请先发起测量定位的审批!");
}
Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
Long gxStepId = sgProgressReportDO.getGxStepId();
@@ -202,7 +215,9 @@
List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
QueryWrapper<SgProgressReportDO> wrapper = new QueryWrapper<>();
wrapper.in("status",Arrays.asList(0,1,2,3));
- if(sgProgressReportDO.getGxDeviceId()==998 || sgProgressReportDO.getGxDeviceId()==999){
+ if(sgProgressReportDO.getGxDeviceId()==998
+ || sgProgressReportDO.getGxDeviceId()==999
+ ){
wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4).eq("profram_id",sgProgressReportDO.getProframId());
}else {
wrapper.eq("gx_step_id", gxStepId).eq("gx_device_id",gxDeviceId).ne("status",4);
@@ -238,9 +253,10 @@
String deviceType ="";
SgDeviceDO sgDeviceDO = new SgDeviceDO();
if (gxDeviceId == 999){
- deviceType = "sgzb";
+ deviceType = "cldw";
//sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
- }else if(gxDeviceId == 998){
+ }else
+ if(gxDeviceId == 998){
deviceType = "sgys";
//sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build());
}else {
@@ -275,7 +291,8 @@
}
//加个项目及设备的状态判断 方便统计计算
- if(gxStepId != 25 && gxStepId != 26 ) {
+ if(gxStepId != 20 &&
+ gxStepId != 26 ) {
if (sgDeviceDO != null && sgDeviceDO.getStatus() == 0) {
sgDeviceDO.setStatus(1);
sgDeviceMapper.updateById(sgDeviceDO);
@@ -301,8 +318,11 @@
sgProgressReportVO.setDeviceName("");}
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> idsCounty = list.stream().filter(s->s.getRoleId().equals(1811657352658042882L)).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>> usersCounty = sgProgressReportMapper.getUserByIdsCounty(idsCounty);
+ users.addAll(usersCounty);
List<Map<String,Object>> roles = sgProgressReportMapper.getRoleByIds(rids);
for (Map<String, Object> user : users) {
@@ -327,7 +347,8 @@
if(sgProgressReportVO.getControlUnit()!=null){
String controlUnit = sgProgressReportVO.getControlUnit();
- List<String> users1=sgProjectInfoMapper.getUserS(controlUnit);
+ List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
+ List<String> users1=sgProjectInfoMapper.getUserS(controlUnitS);
sgProgressReportVO.setUserIDs(users1);
}
String gxStepName = sgProgressReportVO.getGxStepName();
@@ -336,7 +357,8 @@
if("测量定位".equals(gxStepName)){
if(countyCd!=null){
- List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ List<String> controlUnitS = Arrays.asList(countyCd.split(","));
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
sgProgressReportVO.setXbUnitIDs(xbUnitIDs);
}
@@ -505,6 +527,53 @@
@Override
public void updateReport(SgProgressReportDO sgProgressReportDO) {
+ Long gxDeviceId = sgProgressReportDO.getGxDeviceId();
+ Long gxStepId = sgProgressReportDO.getGxStepId();
+ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(gxStepId);
+ List<SgGxStepDO> list = sgGxStepMapper.selectByGxInfoId(sgGxStepDO.getGxInfoId());
+ QueryWrapper<SgProgressReportDO> wrappers = new QueryWrapper<>();
+ wrappers.eq("profram_id", sgProgressReportDO.getProframId()).ne("status", 4).eq("gx_step_name", "测量定位");
+ List<SgProgressReportDO> sgProgressReportDOS1 = sgProgressReportMapper.selectList(wrappers);
+
+ if(sgProgressReportDO.getGxDeviceId()==998){
+ ProjectSearchDTO search = new ProjectSearchDTO();
+ search.setProjectId(sgProgressReportDO.getProframId().toString());
+ List<SgProjectInfoVO> sgProjectInfoVOS = sgProjectInfoMapper.queryStepByProject(search);
+ if(sgProjectInfoVOS != null){
+ sgProjectInfoVOS.forEach(s ->{
+ if(!s.getProjectStatus().equals(2)){
+ throw new ServiceException("请完成所有设备工序审批!");
+ }
+ });
+ }else{
+ throw new ServiceException("无设备审批数据！");
+ }
+
+ }
+
+ if (sgProgressReportDOS1!= null && sgProgressReportDOS1.size() > 0) {
+ for (SgProgressReportDO sgProgressReportDO1 : sgProgressReportDOS1) {
+ if (sgProgressReportDO1.getStatus()!= 2 && sgProgressReportDO1.getStatus()!= 3) {
+ throw new ServiceException("请先完成测量定位的审批!");
+ }
+ }
+ } else if (sgProgressReportDOS1 == null || (!sgProgressReportDO.getGxStepName().equals("测量定位"))) {
+ throw new ServiceException("请先发起测量定位的审批!");
+ }
+
+ for (SgGxStepDO gxStepDO : list) {
+ if (Integer.parseInt(sgGxStepDO.getGxStepNum()) - Integer.parseInt(gxStepDO.getGxStepNum()) >= 1) {
+ QueryWrapper<SgProgressReportDO> wrapper1 = new QueryWrapper<>();
+ wrapper1.eq("gx_step_id", gxStepDO.getId());
+ wrapper1.eq("gx_device_id",gxDeviceId);
+ wrapper1.ne("status",4);
+ wrapper1.ne("status",3);
+ SgProgressReportDO one = sgProgressReportMapper.selectOne(wrapper1);
+ if (one == null || one.getStatus() != 2) {
+ throw new ServiceException("请先完成" + gxStepDO.getGxStepName() + "的审批！");
+ }
+ }
+ }
sgProgressReportMapper.updateById(sgProgressReportDO);
}
@@ -521,14 +590,16 @@
List<String> resultUsers=new ArrayList<>();
if(s.getControlUnit()!=null){
String controlUnit = s.getControlUnit();
- List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -538,7 +609,8 @@
if("测量定位".equals(gxStepName)){
if(countyCd!=null){
- List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ List<String> controlUnitS = Arrays.asList(countyCd.split(","));
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
s.setXbUnitIDs(xbUnitIDs);
}
@@ -577,6 +649,10 @@
@Override
public Map<String, Long> countListAll(ProjectSearchDTO searchDTO) {
+ if (StringUtils.isNotBlank(searchDTO.getTypeName())){
+ List<String> childType = sgGxMapper.childType(searchDTO.getTypeName());
+ searchDTO.setChildTypeList(childType);
+ }
List<SgProgressReportVO> list = sgProgressReportMapper.queryPageListAll(null, searchDTO);
Map<String, Long> map = new HashMap<>();
getStatusCountByList(list, map);
@@ -662,14 +738,16 @@
List<String> resultUsers=new ArrayList<>();
if(s.getControlUnit()!=null){
String controlUnit = s.getControlUnit();
- List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
+ List<String> controlUnitS = Arrays.asList(controlUnit.split(","));
+ List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
resultUsers.addAll(users);
}
-// if(s.getSelfUnit()!=null){
-// String selfUnit = s.getSelfUnit().toString();
-// List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
-// resultUsers.addAll(selfUnitusers);
-// }
+ if(s.getSelfUnit()!=null){
+ String selfUnit = s.getSelfUnit();
+ List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
+ List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
+ resultUsers.addAll(selfUnitusers);
+ }
s.setUserIDs(resultUsers);
@@ -679,7 +757,8 @@
if("测量定位".equals(gxStepName)){
if(countyCd!=null){
- List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
+ List<String> controlUnitS = Arrays.asList(countyCd.split(","));
+ List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(controlUnitS);
s.setXbUnitIDs(xbUnitIDs);
}
@@ -696,17 +775,23 @@
* 设置部门单位查询条件
*/
private void setUnit(ProjectSearchDTO searchDTO, BladeUser user, Long roleId) {
- List<Long> longList = Arrays.stream(user.getDeptId().split(","))
- .map(Long::parseLong)
+ List<String> longList = Arrays.stream(user.getDeptId().split(","))
.collect(Collectors.toList());
//判断是不是省厅建办 否的话就不设置部门
if (!roleId.equals(1800820667082948610L)){
//判断是不是县级建办 否的话就是监理单位下人员进行
- if(!roleId.equals(1811657352658042882L)){
+ if(roleId.equals(1800820855352672257L)){
searchDTO.setUserUnit(longList);
- }else{
+ }
+
+ if(roleId.equals(1811657352658042882L)) {
searchDTO.setCountryUnit(longList);
}
+
+ if(roleId.equals(1800818489547112450L)){
+ searchDTO.setSelfUnit(longList);
+
+ }
}
}
--
Gitblit v1.9.3