From f142d48409503dfd6b11d7d414c0ee7ffa85eed5 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 28 Aug 2024 14:28:04 +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/SgProjectInfoServiceImpl.java | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 202 insertions(+), 15 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 c7bf823..9edb1e2 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
@@ -10,21 +10,18 @@
import cn.gistack.sm.sg.service.SgProjectInfoService;
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
-import cn.hutool.core.lang.copier.Copier;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jetbrains.annotations.NotNull;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StopWatch;
import java.math.BigDecimal;
-import java.math.MathContext;
import java.math.RoundingMode;
import java.util.*;
import java.util.function.Function;
@@ -52,18 +49,100 @@
private SgGxStepMapper sgGxStepMapper;
@Override
- public IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
- List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(page,searchDTO);
- /*List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
- if (CollectionUtils.isNotEmpty(projectProgress)){
- Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
+ public Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
+ List<String> sgCodeS = getSgCodeByUser();
+ searchDTO.setSgCodeS(sgCodeS);
+ Boolean isPage = searchDTO.getIsPage();
+ if (isPage==null) isPage = true;
+ if (isPage ){
+ List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(page,searchDTO);
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ if (CollectionUtils.isNotEmpty(projectProgress)){
+ 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()));
+ });
+ }
+ return page.setRecords(sgProjectInfoDOS);
+ }else {
+ List<SgAllDeptOrUser> allDepts = sgProjectInfoMapper.queryDept();
+ Map<Long, String> deptMap = allDepts.stream().collect(Collectors.toMap(SgAllDeptOrUser::getId, SgAllDeptOrUser::getName));
+ List<SgAllDeptOrUser> allUser = sgProjectInfoMapper.queryUser();
+ Map<Long, String> userMap = allUser.stream().collect(Collectors.toMap(SgAllDeptOrUser::getId, SgAllDeptOrUser::getName));
+ List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(null,searchDTO);
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ if (CollectionUtils.isNotEmpty(projectProgress)){
+ 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()));
+ });
+ }
sgProjectInfoDOS.forEach(s->{
- s.setProjectProgress(progressMap.get(s.getId()));
+ //土建
+ if (StringUtils.isNotBlank(s.getConstructionUnit())){
+ s.setConstructionUnit(deptMap.get(Long.valueOf(s.getConstructionUnit())));
+ }
+ s.setConstructionPerson(getUserNames(userMap, s.getConstructionPerson()));
+
+ //设备
+ if (StringUtils.isNotBlank(s.getSelfUnit())){
+ s.setSelfUnit(deptMap.get(Long.valueOf(s.getSelfUnit())));
+ }
+ s.setSelfPerson(getUserNames(userMap, s.getSelfPerson()));
+
+ //设计
+ if (StringUtils.isNotBlank(s.getDesignUnit())){
+ s.setDesignUnit(deptMap.get(Long.valueOf(s.getDesignUnit())));
+ }
+ s.setDesignPerson(getUserNames(userMap, s.getDesignPerson()));
+
+ //监理
+ if (StringUtils.isNotBlank(s.getControlUnit())){
+ s.setControlUnit(deptMap.get(Long.valueOf(s.getControlUnit())));
+ }
+ s.setControlPerson(getUserNames(userMap, s.getControlPerson()));
+
+ //检测
+ if (StringUtils.isNotBlank(s.getAcceptanceUnit())){
+ s.setAcceptanceUnit(deptMap.get(Long.valueOf(s.getAcceptanceUnit())));
+ }
+ s.setAcceptancePerson(getUserNames(userMap, s.getAcceptancePerson()));
});
- }*/
- return page.setRecords(sgProjectInfoDOS);
+ return sgProjectInfoDOS;
+ }
+
}
+ /**
+ * 获取用户姓名
+ * @param userMap
+ * @return
+ */
+ private String getUserNames(Map<Long, String> userMap,String person ) {
+ String userNames = "";
+ if (StringUtils.isNotBlank(person)){
+ // 使用Stream API来处理分割和映射
+ userNames = Arrays.stream(person.split(",")) // 将字符串按逗号分割成数组，并转为Stream
+ .map(Long::valueOf) // 将每个字符串元素转换为Long
+ .map(userMap::get) // 使用userMap将Long映射为对应的用户名
+ .collect(Collectors.joining(",")); // 使用逗号将用户名拼接成一个字符串
+ return userNames;
+ }
+ return userNames;
+ }
+
+ /**
+ * 获取当前用户的工程编码
+ */
+ public List<String> getSgCodeByUser(){
+ Long userId = AuthUtil.getUserId();
+ String sgCode = sgProjectInfoMapper.getSgCodeByUser(userId.toString());
+ if (StringUtils.isNotBlank(sgCode)){
+ List<String> list = List.of(sgCode.split(","));
+ return list;
+ }
+ return null;
+ }
/**
* 获取项目及项目下设备及设备下工序进度
* @param searchDTO
@@ -235,6 +314,8 @@
@Override
public List<SgProjectInfoDO> listAll(ProjectSearchDTO searchDTO) {
+ List<String> sgCodeS = getSgCodeByUser();
+ searchDTO.setSgCodeS(sgCodeS);
return sgProjectInfoMapper.queryPageList(null,searchDTO);
}
@@ -264,22 +345,121 @@
public List<SgStatisProVO> getsgStatisticsList(String code) {
AttAdBase ywxtAdDetail = iAttAdBaseService.getYwxtAdDetail(code);
List<SgStatisProVO> sgStatisProVOS;
-
-
//片区
if (ywxtAdDetail == null) {
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsZero(code);
+ getDeviceTypes(sgStatisProVOS);
// String getname = sgProjectInfoMapper.getname(code);
String getname = code;
updateProjectProgress(sgStatisProVOS, code, getname, "2");
} else if (ywxtAdDetail.getAdGrad().equals("1")) {//默认
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsOne(code);
+ sgStatisProVOS = getSgStatisProVOS(sgStatisProVOS);
+ getDeviceTypes(sgStatisProVOS);
updateProjectProgress(sgStatisProVOS, ywxtAdDetail.getPAdCode(), ywxtAdDetail.getPAdName(), "0");
} else {//区县
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsList(code);
+ getDeviceTypes(sgStatisProVOS);
updateProjectProgress(sgStatisProVOS, ywxtAdDetail.getAdCode(), ywxtAdDetail.getAdName(), "3");
}
return sgStatisProVOS;
+ }
+
+ /**
+ * 标段排序
+ * @param sgStatisProVOS
+ * @return
+ */
+ private List<SgStatisProVO> getSgStatisProVOS(List<SgStatisProVO> sgStatisProVOS) {
+ sgStatisProVOS = sgStatisProVOS.stream()
+ .sorted(Comparator.comparing(s -> {
+ String scode = s.getCode();
+ 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());
+ return sgStatisProVOS;
+ }
+
+ /**
+ * 统计设备类型开工率
+ * @param sgStatisProVOS
+ */
+ private void getDeviceTypes(List<SgStatisProVO> sgStatisProVOS) {
+ if (CollectionUtils.isNotEmpty(sgStatisProVOS)){
+ for (SgStatisProVO vo : sgStatisProVOS) {
+ String proIds = vo.getProIds();
+ if (StringUtils.isNotBlank(proIds)){
+ List<SgStatisDeviceVO> deviceVOS = sgProjectInfoMapper.getDeviceTypes("("+proIds+")");
+ if(CollectionUtils.isNotEmpty(deviceVOS)){
+ Map<String, SgStatisDeviceVO> map = deviceVOS.stream().collect(Collectors.toMap(SgStatisDeviceVO::getPType, Function.identity()));
+ //表面变形
+ SgStatisDeviceVO sg108 = map.get("sg108");
+ if (Objects.nonNull(sg108)){
+ Integer deviceCount = sg108.getDeviceCount();
+ Integer deviceStart = sg108.getDeviceStart();
+ vo.setSurfaceNum(deviceCount);
+ if (deviceCount != 0){
+ BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
+ vo.setSeepageProgress(getBigDecimalPercent(divide));
+ }else {
+ vo.setSeepageProgress("0%");
+ }
+ }
+ //视频
+ SgStatisDeviceVO sg104 = map.get("sg104");
+ if (Objects.nonNull(sg104)){
+ Integer deviceCount = sg104.getDeviceCount();
+ Integer deviceStart = sg104.getDeviceStart();
+ vo.setVideoNum(deviceCount);
+ if (deviceCount != 0){
+ BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
+ vo.setVideoProgress(getBigDecimalPercent(divide));
+ }else {
+ vo.setVideoProgress("0%");
+ }
+ }
+ //渗压
+ SgStatisDeviceVO sg101 = map.get("sg101");
+ if (Objects.nonNull(sg101)){
+ Integer deviceCount = sg101.getDeviceCount();
+ Integer deviceStart = sg101.getDeviceStart();
+ vo.setTransNum(deviceCount);
+ if (deviceCount != 0){
+ BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
+ vo.setTransProgress(getBigDecimalPercent(divide));
+ }else {
+ vo.setTransProgress("0%");
+ }
+ }
+ //渗流
+ SgStatisDeviceVO sg102 = map.get("sg102");
+ if (Objects.nonNull(sg102)){
+ Integer deviceCount = sg102.getDeviceCount();
+ Integer deviceStart = sg102.getDeviceStart();
+ vo.setSeepageNum(deviceCount);
+ if (deviceCount != 0){
+ BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
+ vo.setSeepageProgress(getBigDecimalPercent(divide));
+ }else {
+ vo.setSeepageProgress("0%");
+ }
+ }
+ }
+ }
+ }
+ }
}
private void updateProjectProgress(List<SgStatisProVO> sgStatisProVOS, String pcode, String pname, String adGrad) {
@@ -402,8 +582,15 @@
QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("gx_step_id", stepIdForNull)
.eq("profram_id", programId);
- SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper);
+ SgProgressReportDO sgProgressReportDO = null;
+ List<SgProgressReportDO> sgProgressReportDOS = sgProgressReportMapper.selectList(queryWrapper);
+ if (CollectionUtils.isNotEmpty(sgProgressReportDOS)) {
+ List<SgProgressReportDO> collect = sgProgressReportDOS.stream().filter(s -> s.getStatus() == null || (s.getStatus() != 4 && !(s.getStatus() == 3 && s.getResubmit() != 0))).collect(Collectors.toList());
+ if (!collect.isEmpty()){
+ sgProgressReportDO = collect.get(0);
+ }
+ }
PreAcceVO preAcceVO = new PreAcceVO();
if (sgProgressReportDO!= null) {
preAcceVO.setId(sgProgressReportDO.getId().toString());
--
Gitblit v1.9.3