From 74da9dfb5fb4085d8847d4c74a97048c6c677514 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 15 一月 2025 10:53:34 +0800
Subject: [PATCH] 完成任务bug(协同办理的才resolveTask)、转办前如果是指定人员删除不掉问题、提取获取运行时任务信息的方法
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 360 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 349 insertions(+), 11 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 8fbb6ef..1210f57 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,12 +1,20 @@
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;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ZipUtil;
import com.alibaba.excel.EasyExcel;
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.base.Result;
+import com.ycl.common.config.SysConfig;
+import com.ycl.common.constant.Constants;
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.common.enums.business.ImportanceTypeEnum;
import com.ycl.common.enums.business.ProjectCategoryEnum;
@@ -17,29 +25,47 @@
import com.ycl.common.utils.StringUtils;
import com.ycl.common.utils.bean.BeanUtils;
import com.ycl.common.utils.excel.OutputExcelUtils;
+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.ProjectInfoForm;
+import com.ycl.domain.form.*;
import com.ycl.domain.query.ProjectExportQuery;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.*;
import com.ycl.framework.utils.PageUtil;
+import com.ycl.listener.excel.ProjectImportListener;
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.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
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;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛� 鏈嶅姟瀹炵幇绫�
@@ -58,6 +84,12 @@
private final ProjectUnitRegistrationInfoMapper unitRegistrationInfoMapper;
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;
/**
* 娣诲姞
@@ -74,6 +106,7 @@
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
baseMapper.insert(entity);
+ addPlan(entity.getId()); //娣诲姞璁″垝琛�
//娣诲姞鏂囦欢
List<File> fileList = form.getFileList();
fileList.forEach(item -> {
@@ -82,6 +115,17 @@
});
fileService.saveBatch(fileList);
return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
+ }
+
+ public void addPlan(Long projectInfoId) {
+ Plan plan = new Plan();
+ plan.setProjectInfoId(projectInfoId);
+ plan.setReportStatus(1);
+ plan.setMonthStatus(1);
+ plan.setSeasonStatus(1);
+ plan.setYearStatus(1);
+ plan.setDeleted(0);
+ planMapper.insert(plan);
}
/**
@@ -185,13 +229,25 @@
return Result.ok().data(list).total(0);
}
+ 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);
+ }
+ }
+
IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
baseMapper.getPage(page, query);
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);
//缈昏瘧椤圭洰闃舵
@@ -378,6 +434,9 @@
ProjectInfo projectInfo = baseMapper.selectById(recordId);
// 鍒ゆ柇褰撳墠鐢ㄦ埛id鏄惁鍦ㄤ富绠″垪琛ㄤ腑
String competentDepartment = projectInfo.getCompetentDepartment();
+ if (StringUtils.isEmpty(competentDepartment)){
+ return Result.ok().data(false);
+ }
List<String> list = Arrays.asList(competentDepartment.split(","));
// 鑾峰緱褰撳墠鐢ㄦ埛id
Long userId = SecurityUtils.getUserId();
@@ -389,28 +448,307 @@
}
@Override
- public void export(HttpServletResponse response, ProjectExportQuery query) {
+ public void export(HttpServletResponse response, ProjectExportQuery query) throws IOException {
List<ProjectVO> data = baseMapper.selectProjectDetailByIds(query.getDataIdList());
List<ProjectExcelTemplate> excelList = new ArrayList<>();
//瀛楀吀浣滅炕璇�
- data.forEach(item->{
+ data.forEach(item -> {
ProjectExcelTemplate excel = new ProjectExcelTemplate();
- BeanUtils.copyProperties(item,excel);
+ BeanUtils.copyProperties(item, excel);
//椤圭洰闃舵
- excel.setProjectPhase(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(),item.getProcessId()!=null));
+ excel.setProjectPhase(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null));
excelList.add(excel);
});
- //琛ュ厖鏂囦欢鐨勫瓧娈�
Set<Integer> indexes = OutputExcelUtils.getSelectFields(query.getFieldList(), ProjectExcelTemplate.class);
//涓嶉渶瑕侀檮浠�
- if(!query.getRequireFile()) {
+ if (!query.getRequireFile()) {
try (ServletOutputStream outputStream = response.getOutputStream()) {
EasyExcel.write(outputStream, ProjectExcelTemplate.class).includeColumnIndexes(indexes).sheet("椤圭洰鍒楄〃").doWrite(excelList);
} catch (Exception e) {
log.error(e.getMessage(), e);
throw new BaseException("瀵煎嚭澶辫触锛�" + e.getMessage());
}
+ } else {
+ //闇�瑕侀檮浠�,瀵煎嚭涓簔ip
+ response.setContentType("application/zip");
+ response.setCharacterEncoding(Charsets.UTF_8.name());
+ String fileName = URLEncoder.encode("椤圭洰鍒楄〃", Charsets.UTF_8);
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".zip");
+
+ java.io.File tempDir = null;
+ try {
+ //鏌ュ嚭闄勪欢
+ List<File> projectInfoFiles = fileMapper.selectList(new QueryWrapper<File>()
+ .in("bus_id", data.stream().map(ProjectVO::getId).collect(Collectors.toList()))
+ .and(q -> q.eq("type", FileTypeEnum.PROJECT_INFO.getType()).or().eq("type", FileTypeEnum.DOCUMENT_INFO.getType()))
+ );
+ List<File> policyFiles = fileMapper.selectList(new QueryWrapper<File>()
+ .in("bus_id", data.stream().map(ProjectVO::getPolicyId).collect(Collectors.toList()))
+ .eq("type", FileTypeEnum.INVEST_POLICY.getType())
+ );
+ projectInfoFiles.addAll(policyFiles);
+ projectInfoFiles.forEach(file -> {
+ data.forEach(item -> {
+ if (FileTypeEnum.PROJECT_INFO.equals(file.getType())) {
+ if (file.getBusId().equals(item.getId())) {
+ //瀹℃壒璁″垝涔�
+ item.setApprovalPlan(file.getOriginalName());
+ }
+ } else if (FileTypeEnum.DOCUMENT_INFO.equals(file.getType())) {
+ if (file.getBusId().equals(item.getId())) {
+ //鐩稿叧鏂囦功
+ item.setDocuments(file.getOriginalName());
+ }
+ } else if (FileTypeEnum.INVEST_POLICY.equals(file.getType())) {
+ if (file.getBusId().equals(item.getPolicyId())) {
+ //绗﹀悎浜т笟鏀跨瓥闄勪欢
+ item.setPolicyComplianceAttachment(file.getOriginalName());
+ }
+ }
+ });
+
+ });
+ // 鍒涘缓涓存椂鐩綍
+ tempDir = Files.createTempDirectory("temp").toFile();
+
+ java.io.File templateDir = new java.io.File(tempDir, "template");
+ if (!templateDir.exists()) {
+ templateDir.mkdirs();
+ }
+
+ // 鍒涘缓 Excel 鏂囦欢
+ java.io.File excelFile = new java.io.File(templateDir, "excel.xlsx");
+ if (!excelFile.exists()) {
+ excelFile.createNewFile();
+ }
+
+ // 鍐欏叆 Excel 妯℃澘鏁版嵁
+ try (FileOutputStream fileOutputStream = new FileOutputStream(excelFile, false)) {
+ EasyExcel.write(fileOutputStream, ProjectExcelTemplate.class).sheet("椤圭洰鍒楄〃").doWrite(excelList);
+ }
+
+ // 鍒涘缓闄勪欢鐩綍
+ java.io.File attachmentDir = new java.io.File(templateDir, "attachment");
+ if (!attachmentDir.exists()) {
+ attachmentDir.mkdirs();
+ }
+
+ //灏嗛檮浠跺鍒跺鐩綍涓�
+ for (File item : projectInfoFiles) {
+ String url = item.getUrl();
+ if (StringUtils.isBlank(url)) continue;
+ url = url.replaceFirst(Constants.RESOURCE_PREFIX, SysConfig.getProfile());
+ // 鐩存帴浣跨敤File绫诲鐞嗙郴缁熻矾寰�
+ java.io.File sourceFile = new java.io.File(url);
+ if (!sourceFile.exists() || !sourceFile.isFile()) {
+ // 澶勭悊鏂囦欢涓嶅瓨鍦ㄦ垨涓嶆槸鏂囦欢鐨勬儏鍐�
+ continue; // 鎴栬�呰褰曟棩蹇椼�佹姏鍑哄紓甯哥瓑
+ }
+ // 鐩爣鏂囦欢璺緞锛屼娇鐢╝ttachmentDir浣滀负鐖剁洰褰曪紝骞朵繚鎸佸師鏂囦欢鍚�
+ java.io.File targetFile = new java.io.File(attachmentDir, sourceFile.getName());
+ // 澶嶅埗鏂囦欢
+ try {
+ Files.copy(sourceFile.toPath(), targetFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ }
+ }
+ // 鎵撳寘 ZIP 鏂囦欢
+ java.io.File zipFile = ZipUtil.zip(templateDir);
+ byte[] zipBytes = Files.readAllBytes(zipFile.toPath());
+
+ // 灏� ZIP 鏂囦欢鍐欏叆鍝嶅簲
+ try (ServletOutputStream outputStream = response.getOutputStream()) {
+ outputStream.write(zipBytes);
+ }
+ } finally {
+ OutputExcelUtils.deleteDirectoryOrFile(tempDir);
+ }
}
- //TODO锛氶渶瑕侀檮浠�
}
+
+ @Override
+ public Result updateUsedStatus(Integer id, Integer usedStatus) {
+ ProjectInfo entity = baseMapper.selectById(id);
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ entity.setUsedStatus(usedStatus);
+ baseMapper.updateById(entity);
+ return Result.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @Transactional
+ @Override
+ public void importProject(MultipartFile file) {
+ java.io.File tempZip = null;
+ java.io.File tempDir = null;
+ try {
+ tempZip = java.io.File.createTempFile("temp", ".zip");
+ try(InputStream inputStream = file.getInputStream()) {
+ Files.copy(inputStream, tempZip.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ tempDir = Files.createTempDirectory("temp-dir").toFile();
+
+ try {
+ ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_UTF_8);
+ }catch (IORuntimeException e){
+ log.error("瑙ｅ帇澶辫触锛屽皾璇曚娇鐢℅BK缂栫爜瑙ｅ帇...");
+ ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_GBK);
+ }
+
+ Path path = tempDir.toPath();
+ ProjectImportListener projectImportListener = new ProjectImportListener();
+ //闇�瑕佸瓨鍏ユ暟鎹簱
+ ArrayList<File> attachments = new ArrayList<>();
+ //瀹為檯鐨勬枃浠�
+ List<java.io.File> files = new ArrayList<>();
+ try (Stream<Path> pathStream = Files.walk(path)) {
+ pathStream.forEach(filePath -> {
+ if (Files.isDirectory(filePath) && filePath.getFileName().toString().equals("attachment")) {
+ //闄勪欢澶勭悊
+ try (Stream<Path> stream = Files.walk(filePath)) {
+ stream.forEach(attachmentPath -> {
+ if (Files.isRegularFile(attachmentPath)) {
+ files.add(attachmentPath.toFile());
+ }
+ });
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ throw new RuntimeException(e);
+ }
+ } else if (Files.isRegularFile(filePath) && filePath.getFileName().toString().equals("excel.xlsx")) {
+ //瀵煎叆鏁版嵁澶勭悊
+ try (FileInputStream fileInputStream = new FileInputStream(filePath.toFile())) {
+ ExcelUtil.importExcel(fileInputStream, ProjectExcelTemplate.class, projectImportListener);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ }
+ /* 鎶婇檮浠跺瓨鍏ヤ笂浼犺矾寰� */
+ //涓婁紶鏂囦欢璺緞
+ String filePath = SysConfig.getUploadPath();
+ files.forEach(attachmentFile -> {
+ try {
+ //涓婁紶
+ String url = FileUploadUtils.uploadIOFile(filePath, attachmentFile);
+ //瀛樻斁鐨勬枃浠跺悕浼氬姞涓奯鏃堕棿鎴崇殑鍚庣紑
+ String newName = FileUtils.getName(url);
+ attachments.add(new File()
+ .setUrl(url)
+ .setName(newName)
+ .setOriginalName(attachmentFile.getName()));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ });
+
+ Map<String, Long> projectInfoMap = projectImportListener.getProjectInfoMap();
+ Map<String, Long> investmentProjectPolicyComplianceMap = projectImportListener.getInvestmentProjectPolicyComplianceMap();
+ Map<String, Long> documentsMap = projectImportListener.getDocumentsMap();
+ //琛ュ厖type鍜宐usId瀛楁
+ attachments.forEach(attachment -> {
+ String fileName = attachment.getOriginalName();
+ if (ObjectUtil.isNotNull(projectInfoMap.get(fileName))) {
+ attachment.setBusId(projectInfoMap.get(fileName));
+ attachment.setType(FileTypeEnum.PROJECT_INFO);
+ } else if (ObjectUtil.isNotNull(investmentProjectPolicyComplianceMap.get(fileName))) {
+ attachment.setBusId(investmentProjectPolicyComplianceMap.get(fileName));
+ attachment.setType(FileTypeEnum.INVEST_POLICY);
+ } else if (ObjectUtil.isNotNull(documentsMap.get(fileName))) {
+ attachment.setBusId(documentsMap.get(fileName));
+ attachment.setType(FileTypeEnum.DOCUMENT_INFO);
+ }
+ });
+
+ // 娣诲姞椤圭洰闄勪欢鍏宠仈琛�
+ fileService.saveBatch(attachments);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ throw new RuntimeException(e);
+ } finally {
+ deleteDirectoryOrFile(tempZip);
+ deleteDirectoryOrFile(tempDir);
+ }
+ }
+
+ @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("鎻愪氦鎴愬姛");
+ }
+
+ private static void deleteDirectoryOrFile(java.io.File file) {
+ if (ObjectUtil.isNull(file)) {
+ return;
+ }
+
+ if (file.isDirectory()) {
+ java.io.File[] files = file.listFiles();
+ if (files != null) {
+ for (java.io.File f : files) {
+ deleteDirectoryOrFile(f);
+ }
+ }
+ }
+ file.delete();
+ }
+ /**
+ * 椤圭洰鍚嶇О鏍￠獙閲嶅
+ * @return
+ */
+ public void checkProjectNameUnique(ProjectInfo projectInfo) {
+ if (StrUtil.isBlank(projectInfo.getProjectName())) {
+ throw new BaseException("椤圭洰鍚嶇О涓嶈兘涓虹┖");
+ }
+ Assert.isTrue(baseMapper.selectCount(Wrappers.<ProjectInfo>lambdaQuery().eq(ProjectInfo::getProjectName, projectInfo.getProjectName())) == 0, "椤圭洰鍚嶇О閲嶅");
+ }
+
}
--
Gitblit v1.8.0