From 2236321be028e7b14ae163a3f3a45c79e9fb4dc7 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 12 二月 2025 17:46:16 +0800 Subject: [PATCH] 新增储备项目直接审核通过 --- business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 13 ++++++------- 1 files changed, 6 insertions(+), 7 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 7d99e28..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.*; @@ -61,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; /** * 椤圭洰绠$悊鍩虹淇℃伅琛� 鏈嶅姟瀹炵幇绫� @@ -111,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()); //娣诲姞璁″垝琛� //娣诲姞鏂囦欢 -- Gitblit v1.8.0