From 79eb2ef5f0297982b885016fe48ac65918a1040c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:48:41 +0800
Subject: [PATCH] 赋码时间格式改为d-h
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 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 1210f57..4d0d216 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;
@@ -103,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);
@@ -232,18 +237,18 @@
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);
- }
- }
+// 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 -> {
@@ -314,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<>();
@@ -434,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(","));
@@ -584,7 +589,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);
}
@@ -592,9 +597,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();
@@ -677,11 +682,11 @@
@Override
public Result editProject(ProjectForm form) {
- if (ObjectUtil.isNotNull(form.getProjectInfoForm())){
+ if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
//鏂板
add(form.getProjectInfoForm());
- }else {
+ } else {
//鏇存柊
update(form.getProjectInfoForm());
}
@@ -689,40 +694,50 @@
if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) {
projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
- }else {
+ } else {
projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
}
}
if (ObjectUtil.isNotNull(form.getProjectInvestmentFundingForm())) {
if (ObjectUtil.isNull(form.getProjectInvestmentFundingForm().getId())) {
projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
- }else {
+ } else {
projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
}
}
if (ObjectUtil.isNotNull(form.getProjectInvestmentPolicyComplianceForm())) {
if (ObjectUtil.isNull(form.getProjectInvestmentPolicyComplianceForm().getId())) {
projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
- }else {
+ } else {
projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
}
}
if (ObjectUtil.isNotNull(form.getProjectUnitRegistrationInfoForm())) {
if (ObjectUtil.isNull(form.getProjectUnitRegistrationInfoForm().getId())) {
projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
- }else {
+ } else {
projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
}
}
if (ObjectUtil.isNotNull(form.getDocumentInfoForm())) {
- if (ObjectUtil.isNull(form.getDocumentInfoForm().getProjectId())){
+ if (ObjectUtil.isNull(form.getDocumentInfoForm().getProjectId())) {
return Result.error("璇峰厛淇濆瓨鎶曡祫绠＄悊鍩烘湰淇℃伅");
- }else {
+ } 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) {
@@ -740,8 +755,10 @@
}
file.delete();
}
+
/**
* 椤圭洰鍚嶇О鏍￠獙閲嶅
+ *
* @return
*/
public void checkProjectNameUnique(ProjectInfo projectInfo) {
--
Gitblit v1.8.0