From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 insertions(+), 10 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 0dd853d..4d0d216 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,18 +1,23 @@
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.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;
@@ -26,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.*;
@@ -39,6 +43,7 @@
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;
@@ -83,6 +88,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;
/**
* 娣诲姞
@@ -96,6 +106,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);
@@ -222,13 +234,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);
+ 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);
//缈昏瘧椤圭洰闃舵
@@ -295,7 +319,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<>();
@@ -415,7 +439,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(","));
@@ -565,12 +589,18 @@
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);
}
tempDir = Files.createTempDirectory("temp-dir").toFile();
- ZipUtil.unzip(tempZip, tempDir, StandardCharsets.ISO_8859_1);
+
+ 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();
@@ -609,7 +639,7 @@
files.forEach(attachmentFile -> {
try {
//涓婁紶
- String url = FileUploadUtils.upload(filePath, file);
+ String url = FileUploadUtils.uploadIOFile(filePath, attachmentFile);
//瀛樻斁鐨勬枃浠跺悕浼氬姞涓奯鏃堕棿鎴崇殑鍚庣紑
String newName = FileUtils.getName(url);
attachments.add(new File()
@@ -650,6 +680,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;
@@ -665,8 +755,10 @@
}
file.delete();
}
+
/**
* 椤圭洰鍚嶇О鏍￠獙閲嶅
+ *
* @return
*/
public void checkProjectNameUnique(ProjectInfo projectInfo) {
--
Gitblit v1.8.0