From 580aab8d7f186d83409d177f4aed2fe60e01b67f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 11:33:05 +0800
Subject: [PATCH] 赋码定时任务查询正在运行的任务
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
index 4d0d216..c3d6a40 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,6 +1,5 @@
package com.ycl.service.impl;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -8,12 +7,10 @@
import cn.hutool.core.util.ZipUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.common.annotation.DataScope;
import com.ycl.common.base.Result;
import com.ycl.common.config.SysConfig;
import com.ycl.common.constant.Constants;
@@ -21,6 +18,7 @@
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.common.enums.business.ImportanceTypeEnum;
import com.ycl.common.enums.business.ProjectCategoryEnum;
+import com.ycl.common.enums.business.ProjectStatusEnum;
import com.ycl.common.exception.base.BaseException;
import com.ycl.common.utils.CopyUtils;
import com.ycl.common.utils.DateUtils;
@@ -31,7 +29,7 @@
import com.ycl.common.utils.file.FileUploadUtils;
import com.ycl.common.utils.file.FileUtils;
import com.ycl.common.utils.poi.ExcelUtil;
-import com.ycl.controller.ProjectInfoController;
+import com.ycl.constant.ProjectConstant;
import com.ycl.domain.entity.*;
import com.ycl.domain.excel.ProjectExcelTemplate;
import com.ycl.domain.form.*;
@@ -49,6 +47,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
@@ -60,15 +59,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import java.util.zip.ZipOutputStream;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛� 鏈嶅姟瀹炵幇绫�
@@ -110,6 +106,10 @@
entity.setProjectOwnerUnit(deptId);
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
+ //濡傛灉涓嶆槸鍌ㄥ椤圭洰(涓嶆槸鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
baseMapper.insert(entity);
addPlan(entity.getId()); //娣诲姞璁″垝琛�
//娣诲姞鏂囦欢
@@ -202,7 +202,7 @@
}
/**
- * 鍒嗛〉鏌ヨ
+ * 鍒嗛〉鏌ヨ锛孴ODO 椤圭洰涓績鐨勫垎椤典娇鐢ㄥ崟鐙殑鎺ュ彛锛屽幓鎺夊啓姝荤殑閫昏緫鎹㈡垚dept or鏌ヨ
*
* @param query
* @return
@@ -237,15 +237,17 @@
Long userId = SecurityUtils.getUserId();
String ancestors = sysDeptMapper.selectAncestors(userId);
String[] ancestorArr = ancestors.split(",");
-// for (String ancestor : ancestorArr) {
-// if ("101".equals(ancestor)) { // 涓氫富
-// query.setCreateBy(userId);
-// query.setRole(0);
-// } else if ("102".equals(ancestor)) { // 瀹℃壒
-// query.setUsedStatus(1);
-// query.setRole(1);
-// }
-// }
+ List<String> ancestorList = Arrays.stream(ancestorArr).collect(Collectors.toList());
+ ancestorList.add(SecurityUtils.getDeptId()+"");
+ if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("101")){
+ query.setProjectOwnerUnit(SecurityUtils.getDeptId());
+ //涓氫富
+ query.setRole(0);
+ }else if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")){
+ query.setCompetentDepartment(SecurityUtils.getDeptId());
+ //瀹℃壒 瀵瑰簲涓荤閮ㄩ棬
+ query.setRole(1);
+ }
IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
baseMapper.getPage(query, page);
@@ -255,6 +257,8 @@
ProjectInfoVO.transform(vo);
ProjectVO projectVO = new ProjectVO();
copyToProjectVO(vo, projectVO);
+ List<Long> departmentList = vo.getCompetentDepartmentList();
+ projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (!CollectionUtils.isEmpty(departmentList) && departmentList.contains(SecurityUtils.getDeptId())));
//缈昏瘧椤圭洰闃舵
String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null);
projectVO.setProjectPhase(phase);
@@ -287,6 +291,8 @@
ProjectInfo entity = baseMapper.getById(id);
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
+ List<Long> departmentList = vo.getCompetentDepartmentList();
+ vo.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (!CollectionUtils.isEmpty(departmentList) && departmentList.contains(SecurityUtils.getDeptId())));
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
fileQueryWrapper.eq("bus_id", vo.getId());
@@ -373,28 +379,26 @@
indexCountVO.setProPhaseCountVO(proPhaseCountVO);
List<IndexImpTypeCountVO> impTypeCountVO = new ArrayList<>();
- impTypeCountVO.add(new IndexImpTypeCountVO("涓�鑸」鐩�", province.size(), province.stream().
+ impTypeCountVO.add(new IndexImpTypeCountVO("涓�鑸」鐩�", normal.size(), normal.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
.reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鏅�"));
- impTypeCountVO.add(new IndexImpTypeCountVO("鍘块噸鐐归」鐩�", city.size(), city.stream().
+ impTypeCountVO.add(new IndexImpTypeCountVO("鍘块噸鐐归」鐩�", county.size(), county.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
.reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鍘�"));
- impTypeCountVO.add(new IndexImpTypeCountVO("甯傞噸鐐归」鐩�", county.size(), county.stream().
+ impTypeCountVO.add(new IndexImpTypeCountVO("甯傞噸鐐归」鐩�", city.size(), city.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
.reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "甯�"));
- impTypeCountVO.add(new IndexImpTypeCountVO("鐪侀噸鐐归」鐩�", normal.size(), normal.stream().
+ impTypeCountVO.add(new IndexImpTypeCountVO("鐪侀噸鐐归」鐩�", province.size(), province.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
.reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鐪�"));
indexCountVO.setImpTypeCountVO(impTypeCountVO);
-
-
return indexCountVO;
}
--
Gitblit v1.8.0