From 8d491a439cd84ec8667e140a853040e591107fdf Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 23 Sep 2024 18:20:04 +0800
Subject: [PATCH] 湖北水库：审批流程问题整改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
index 1fb2f5e..bf264d3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -7,6 +7,7 @@
import cn.gistack.sm.sg.mapper.SgGxStepMapper;
import cn.gistack.sm.sg.mapper.SgProgressReportMapper;
import cn.gistack.sm.sg.mapper.SgProjectInfoMapper;
+import cn.gistack.sm.sg.service.SgProgressReportService;
import cn.gistack.sm.sg.service.SgProjectInfoService;
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
@@ -48,10 +49,14 @@
@Autowired
private SgGxStepMapper sgGxStepMapper;
+ @Autowired
+ private SgProgressReportServiceImpl sgProgressReportService;
+
@Override
public Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
List<String> sgCodeS = getSgCodeByUser();
searchDTO.setSgCodeS(sgCodeS);
+ setAdCode(searchDTO);
Boolean isPage = searchDTO.getIsPage();
if (isPage==null) isPage = true;
if (isPage ){
@@ -61,7 +66,7 @@
Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
sgProjectInfoDOS.forEach(s->{
s.setProjectProgress(progressMap.get(s.getId()));
- setPercentage(s);
+// setPercentage(s);
});
}
return page.setRecords(sgProjectInfoDOS);
@@ -76,7 +81,7 @@
Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
sgProjectInfoDOS.forEach(s->{
s.setProjectProgress(progressMap.get(s.getId()));
- setPercentage(s);
+// setPercentage(s);
});
}
sgProjectInfoDOS.forEach(s->{
@@ -120,10 +125,11 @@
* @param s
*/
private void setPercentage(SgProjectInfoDO s) {
- s.setSurfaceProgress(s.getSurfaceProgress()==null?null:s.getSurfaceProgress()+"%");
- s.setVideoProgress(s.getVideoProgress()==null?null:s.getVideoProgress()+"%");
- s.setTransProgress(s.getTransProgress()==null?null:s.getTransProgress()+"%");
- s.setSeepageProgress(s.getSeepageProgress()==null?null:s.getSeepageProgress()+"%");
+ s.setSurfaceProgress(StringUtils.isNotBlank(s.getSurfaceProgress()) ?null:s.getSurfaceProgress()+"%");
+ s.setVideoProgress(StringUtils.isNotBlank(s.getVideoProgress())?null:s.getVideoProgress()+"%");
+ s.setTransProgress(StringUtils.isNotBlank(s.getTransProgress())?null:s.getTransProgress()+"%");
+ s.setSeepageProgress(StringUtils.isNotBlank(s.getSeepageProgress())?null:s.getSeepageProgress()+"%");
+ s.setProjectAddress(StringUtils.isNotBlank(s.getProjectProgress())?null:s.getProjectProgress()+"%");
}
/**
@@ -301,6 +307,7 @@
*/
@Override
public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
+// setDeptId(searchDTO);
List<SgProjectInfoVO> list = new ArrayList<>();
if(StringUtils.isNotBlank(searchDTO.getAdCode())){
list = sgProjectInfoMapper.progressList1(page, searchDTO);
@@ -334,7 +341,23 @@
public List<SgProjectInfoDO> listAll(ProjectSearchDTO searchDTO) {
List<String> sgCodeS = getSgCodeByUser();
searchDTO.setSgCodeS(sgCodeS);
- return sgProjectInfoMapper.queryPageList(null,searchDTO);
+ setDeptId(searchDTO);
+ List<SgProjectInfoDO> list = sgProjectInfoMapper.queryPageList(null, searchDTO);
+ return list;
+ }
+
+ /**
+ * setDeptId
+ * @param searchDTO
+ */
+ private void setDeptId(ProjectSearchDTO searchDTO) {
+ String deptId = AuthUtil.getDeptId();
+ boolean b = Objects.nonNull(searchDTO.getIsUnit()) && searchDTO.getIsUnit() == 1;
+ if (!deptId.equals("420000000000")){
+ if (!b){
+ searchDTO.setDeptId(deptId);
+ }
+ }
}
/**
@@ -394,13 +417,13 @@
SgOperatingRateVO sVo = deviceTypes.get(vo.getProIds());
if (Objects.nonNull(sVo)){
vo.setSurfaceNum(sVo.getSurfaceNum());
- vo.setSurfaceProgress(sVo.getSurfaceProgress()==null?null:sVo.getSurfaceProgress()+"%");
+ vo.setSurfaceProgress(sVo.getSurfaceProgress());
vo.setVideoNum(sVo.getVideoNum());
- vo.setVideoProgress(sVo.getVideoProgress()==null?null:sVo.getVideoProgress()+"%");
+ vo.setVideoProgress(sVo.getVideoProgress());
vo.setTransNum(sVo.getTransNum());
- vo.setTransProgress(sVo.getTransProgress()==null?null:sVo.getTransProgress()+"%");
+ vo.setTransProgress(sVo.getTransProgress());
vo.setSeepageNum(sVo.getSeepageNum());
- vo.setSeepageProgress(sVo.getSeepageProgress()==null?null:sVo.getSeepageProgress()+"%");
+ vo.setSeepageProgress(sVo.getSeepageProgress());
}
}
}
@@ -455,7 +478,7 @@
BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
}else {
- sgOperatingRateVO.setSeepageProgress("0");
+ sgOperatingRateVO.setSeepageProgress("0%");
}
}
//视频
@@ -468,7 +491,7 @@
BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
sgOperatingRateVO.setVideoProgress(getBigDecimalPercent(divide));
}else {
- sgOperatingRateVO.setVideoProgress("0");
+ sgOperatingRateVO.setVideoProgress("0%");
}
}
//渗压
@@ -481,7 +504,7 @@
BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
sgOperatingRateVO.setTransProgress(getBigDecimalPercent(divide));
}else {
- sgOperatingRateVO.setTransProgress("0");
+ sgOperatingRateVO.setTransProgress("0%");
}
}
//渗流
@@ -494,7 +517,7 @@
BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
}else {
- sgOperatingRateVO.setSeepageProgress("0");
+ sgOperatingRateVO.setSeepageProgress("0%");
}
}
}
@@ -520,7 +543,11 @@
for (String id : ids) {
projectSearchDTO.setProjectId(id);
List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
- getProjectProgress(list).forEach(ss -> bigDecimals.add(ss.getProjectProgressNum()));
+ getProjectProgress(list).forEach(ss->{
+ if (Objects.nonNull(ss.getProjectProgressNum())){
+ bigDecimals.add(ss.getProjectProgressNum());
+ }
+ });
}
BigDecimal reduce = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -595,11 +622,13 @@
BigDecimal percentage = bigDecimal.multiply(new BigDecimal("100"));
// 如果不需要保留小数位，可以设置一个scale为0
BigDecimal percentageRounded = percentage.setScale(0, RoundingMode.HALF_UP);
- return percentageRounded.toString();
+ return percentageRounded+"%";
}
@Override
public Map<String, Object> projectCount(ProjectSearchDTO searchDTO) {
+ List<String> sgCodeS = getSgCodeByUser();
+ searchDTO.setSgCodeS(sgCodeS);
Map<String, Object> map = new HashMap<>();
List<SgProjectInfoVO> progressList = progressList(searchDTO);
BigDecimal reduce = progressList.stream().filter(s->s.getProjectProgressNum()!=null).map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -659,6 +688,7 @@
public List<SgProjectTreeVO> projectTree(ProjectSearchDTO dto) {
List<String> sgCodeS = getSgCodeByUser();
dto.setSgCodeS(sgCodeS);
+ setAdCode(dto);
List<SgProjectTreeVO> list = sgProjectInfoMapper.projectTree(dto);
if (CollectionUtils.isNotEmpty(list)){
list.forEach(x->{
@@ -743,9 +773,45 @@
provinceNode.setChildList(provinceChildren);
tree.add(provinceNode);
}
- return tree;
+ List<SgProjectTreeVO> childList = tree.get(0).getChildList();
+ List<SgProjectTreeVO> collect = childList.stream()
+ .sorted(Comparator.comparing(s -> {
+ String scode = s.getRegionName();
+ if (scode.equals("第一标段")) {
+ return 1;
+ } else if (scode.equals("第二标段")) {
+ return 2;
+ } else if (scode.equals("第三标段")) {
+ return 3;
+ } else if (scode.equals("第四标段")) {
+ return 4;
+ } else if (scode.equals("第五标段")) {
+ return 5;
+ } else {
+ return Integer.MAX_VALUE;
+ }
+ }))
+ .collect(Collectors.toList());
+ tree.get(0).setChildList(collect);
+ return tree;
+
}
return new ArrayList<>();
}
+ private void setAdCode(ProjectSearchDTO dto) {
+ String deptId = AuthUtil.getDeptId();
+ Long roleId = sgProgressReportService.getRoleId();
+ if(!roleId.equals(1811657352658042882L)){
+ dto.setAdCode(deptId);
+ }
+ }
+
+ @Override
+ public IPage<ResVO> resList(IPage<ResVO> page, ProjectSearchDTO dto) {
+ List<String> sgCodeByUser = getSgCodeByUser();
+ dto.setSgCodeS(sgCodeByUser);
+ return page.setRecords(baseMapper.resList(page,dto));
+ }
+
}
--
Gitblit v1.9.3