From 96a893bcc673085f7d6fe3bc5ca7dc34e7ca1db2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 12 二月 2025 17:44:25 +0800
Subject: [PATCH] flowable模块中的FlowTaskService及controller移动到business模块，完成任务和驳回任务添加日志
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 125 +++++++++++++++++++++++++++++++++++------
1 files changed, 107 insertions(+), 18 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 7a70638..7d99e28 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -7,14 +7,17 @@
import cn.hutool.core.util.StrUtil;
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;
+import com.ycl.common.core.domain.BaseEntity;
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.common.enums.business.ImportanceTypeEnum;
import com.ycl.common.enums.business.ProjectCategoryEnum;
@@ -28,11 +31,10 @@
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.domain.entity.*;
import com.ycl.domain.excel.ProjectExcelTemplate;
-import com.ycl.domain.form.DocumentInfoForm;
-import com.ycl.domain.form.PlanForm;
-import com.ycl.domain.form.ProjectInfoForm;
+import com.ycl.domain.form.*;
import com.ycl.domain.query.ProjectExportQuery;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.*;
@@ -41,11 +43,13 @@
import com.ycl.mapper.*;
import com.ycl.service.FileService;
import com.ycl.service.ProjectInfoService;
+import com.ycl.system.mapper.SysDeptMapper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.codec.Charsets;
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;
@@ -85,6 +89,11 @@
private final FileService fileService;
private final FileMapper fileMapper;
private final PlanMapper planMapper;
+ private final ProjectInvestmentInfoServiceImpl projectInvestmentInfoServiceImpl;
+ private final ProjectInvestmentFundingServiceImpl projectInvestmentFundingServiceImpl;
+ private final ProjectInvestmentPolicyComplianceServiceImpl projectInvestmentPolicyComplianceServiceImpl;
+ private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl;
+ private final SysDeptMapper sysDeptMapper;
/**
* 娣诲姞
@@ -98,6 +107,8 @@
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
Long userId = SecurityUtils.getUserId();
+ Long deptId = SecurityUtils.getDeptId();
+ entity.setProjectOwnerUnit(deptId);
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
baseMapper.insert(entity);
@@ -192,7 +203,7 @@
}
/**
- * 鍒嗛〉鏌ヨ
+ * 鍒嗛〉鏌ヨ锛孴ODO 椤圭洰涓績鐨勫垎椤典娇鐢ㄥ崟鐙殑鎺ュ彛锛屽幓鎺夊啓姝荤殑閫昏緫鎹㈡垚dept or鏌ヨ
*
* @param query
* @return
@@ -224,15 +235,31 @@
return Result.ok().data(list).total(0);
}
+ Long userId = SecurityUtils.getUserId();
+ String ancestors = sysDeptMapper.selectAncestors(userId);
+ String[] ancestorArr = ancestors.split(",");
+ 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(page, query);
+ baseMapper.getPage(query, page);
List<ProjectInfoVO> records = page.getRecords();
List<ProjectVO> list = new ArrayList<>();
records.forEach(vo -> {
ProjectInfoVO.transform(vo);
- vo.setProjectColorCode("green");
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);
@@ -265,6 +292,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());
@@ -297,7 +326,7 @@
// {"type":"鐪侀噸鐐归」鐩�","count":0,"amount":"0.00","text":"鐪�"}]}}
IndexCountVO indexCountVO = new IndexCountVO();
List<IndexProPhaseCountVO> proPhaseCountVO = new ArrayList<>();
- List<ProjectVO> projectVOS = baseMapper.homeCount();
+ List<ProjectVO> projectVOS = baseMapper.homeCount(new BaseEntity());
List<ProjectVO> reserve = new ArrayList<>();
List<ProjectVO> previous = new ArrayList<>();
List<ProjectVO> implement = new ArrayList<>();
@@ -351,28 +380,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;
}
@@ -417,7 +444,7 @@
ProjectInfo projectInfo = baseMapper.selectById(recordId);
// 鍒ゆ柇褰撳墠鐢ㄦ埛id鏄惁鍦ㄤ富绠″垪琛ㄤ腑
String competentDepartment = projectInfo.getCompetentDepartment();
- if (StringUtils.isEmpty(competentDepartment)){
+ if (StringUtils.isEmpty(competentDepartment)) {
return Result.ok().data(false);
}
List<String> list = Arrays.asList(competentDepartment.split(","));
@@ -567,7 +594,7 @@
java.io.File tempDir = null;
try {
tempZip = java.io.File.createTempFile("temp", ".zip");
- try(InputStream inputStream = file.getInputStream()) {
+ try (InputStream inputStream = file.getInputStream()) {
Files.copy(inputStream, tempZip.toPath(), StandardCopyOption.REPLACE_EXISTING);
}
@@ -575,9 +602,9 @@
try {
ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_UTF_8);
- }catch (IORuntimeException e){
- log.error("瑙ｅ帇澶辫触锛屽皾璇曚娇鐢℅BK缂栫爜瑙ｅ帇...");
- ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_GBK);
+ } catch (IORuntimeException e) {
+ log.error("瑙ｅ帇澶辫触锛屽皾璇曚娇鐢℅BK缂栫爜瑙ｅ帇...");
+ ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_GBK);
}
Path path = tempDir.toPath();
@@ -658,6 +685,66 @@
}
}
+ @Override
+ public Result editProject(ProjectForm form) {
+ if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
+ if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
+ //鏂板
+ add(form.getProjectInfoForm());
+ } else {
+ //鏇存柊
+ update(form.getProjectInfoForm());
+ }
+ }
+ if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
+ if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) {
+ projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
+ } else {
+ projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
+ }
+ }
+ if (ObjectUtil.isNotNull(form.getProjectInvestmentFundingForm())) {
+ if (ObjectUtil.isNull(form.getProjectInvestmentFundingForm().getId())) {
+ projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
+ } else {
+ projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
+ }
+ }
+ if (ObjectUtil.isNotNull(form.getProjectInvestmentPolicyComplianceForm())) {
+ if (ObjectUtil.isNull(form.getProjectInvestmentPolicyComplianceForm().getId())) {
+ projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
+ } else {
+ projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
+ }
+ }
+ if (ObjectUtil.isNotNull(form.getProjectUnitRegistrationInfoForm())) {
+ if (ObjectUtil.isNull(form.getProjectUnitRegistrationInfoForm().getId())) {
+ projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
+ } else {
+ projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
+ }
+ }
+ if (ObjectUtil.isNotNull(form.getDocumentInfoForm())) {
+ if (ObjectUtil.isNull(form.getDocumentInfoForm().getProjectId())) {
+ return Result.error("璇峰厛淇濆瓨鎶曡祫绠＄悊鍩烘湰淇℃伅");
+ } else {
+ addDoc(form.getDocumentInfoForm());
+ }
+ }
+
+ return Result.ok("鎻愪氦鎴愬姛");
+ }
+
+ @Override
+ public Result searchByKey(String wordKey) {
+ Wrapper wrapper = null;
+ if (!StringUtils.isEmpty(wordKey)) {
+ wrapper = Wrappers.<ProjectInfo>lambdaQuery().like(ProjectInfo::getProjectName, wordKey).or().like(ProjectInfo::getProjectCode, wordKey);
+ }
+ List<ProjectInfo> list = baseMapper.selectList(wrapper);
+ return Result.ok().data(list);
+ }
+
private static void deleteDirectoryOrFile(java.io.File file) {
if (ObjectUtil.isNull(file)) {
return;
@@ -673,8 +760,10 @@
}
file.delete();
}
+
/**
* 椤圭洰鍚嶇О鏍￠獙閲嶅
+ *
* @return
*/
public void checkProjectNameUnique(ProjectInfo projectInfo) {
--
Gitblit v1.8.0