From 17e9ad4bbbbd0129e8da4dc0cfeee0028d7121e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 24 二月 2025 17:40:23 +0800
Subject: [PATCH] 资金类型和重点分类多选

---
 business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java |   47 +++++++++++++++++++++++++++--------------------
 1 files changed, 27 insertions(+), 20 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 c333f28..aa3c90f 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -113,11 +113,11 @@
         entity.setCreateBy(userId);
         entity.setUpdateBy(userId);
         //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
-        if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){
+        if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
             entity.setUsedStatus(ProjectConstant.PASS);
         }
         if(!checkProjectNameAndIdIsUnique(entity,null)){
-            return Result.error("椤圭洰鍚嶆垨椤圭洰鐮佸凡瀛樺湪");
+            throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
         }
         baseMapper.insert(entity);
         addPlan(entity.getId()); //娣诲姞璁″垝琛�
@@ -130,9 +130,9 @@
         fileService.saveBatch(fileList);
 
         //娣诲姞椤圭洰涓爣鍗曚綅
-        saveUnit(entity.getId(),form.getWinUnitList());
+        saveUnit(entity.getId(), form.getWinUnitList());
         //娣诲姞骞村害鎶曡祫璁″垝
-        saveYearPlan(entity.getId(),form.getYearPlanList());
+        saveYearPlan(entity.getId(), form.getYearPlanList());
         return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
     }
 
@@ -146,9 +146,8 @@
         if (updateId == null) {
 
             queryWrapper.eq("project_name", entity.getProjectName());
-
+            queryWrapper.eq("deleted",0);
             if (StringUtils.isNotEmpty(entity.getProjectCode())) {
-                queryWrapper.or();
                 queryWrapper.eq("project_code", entity.getProjectCode());
             }
 
@@ -194,8 +193,12 @@
         if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
             entity.setUsedStatus(ProjectConstant.PASS);
         }
+        // 绠$悊鍛樹慨鏀圭殑鐩存帴閫氳繃
+        if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+            entity.setUsedStatus(ProjectConstant.PASS);
+        }
         if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
-            return Result.error("椤圭洰鍚嶆垨椤圭洰鐮佸凡瀛樺湪");
+            throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
         }
         //鏇存柊椤圭洰淇℃伅
         baseMapper.updateById(entity);
@@ -471,7 +474,8 @@
                 city.add(item);
             } else if (ImportanceTypeEnum.SHEHONG_KEY.getType().equals(item.getImportanceType())) {
                 county.add(item);
-            } else if (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType())) {
+            } else // if  (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType()))
+            {
                 normal.add(item);
             }
         });
@@ -479,22 +483,22 @@
         proPhaseCountVO.add(new IndexProPhaseCountVO("鍌ㄥ瑙勫垝闃舵", reserve.size(), reserve.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(), "鍌�"));
+                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鍌�"));
 
         proPhaseCountVO.add(new IndexProPhaseCountVO("椤圭洰鍓嶆湡闃舵", previous.size(), previous.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(), "鏂�"));
+                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鏂�"));
 
         proPhaseCountVO.add(new IndexProPhaseCountVO("瀹炴柦闃舵", implement.size(), implement.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(), "寤�"));
+                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "寤�"));
 
         proPhaseCountVO.add(new IndexProPhaseCountVO("绔e伐鎶曠敤闃舵", finish.size(), finish.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(), "绔�"));
+                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "绔�"));
 
         indexCountVO.setProPhaseCountVO(proPhaseCountVO);
 
@@ -502,22 +506,22 @@
         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(), "鏅�"));
+                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鏅�"));
 
         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(), "鍘�"));
+                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鍘�"));
 
         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(), "甯�"));
+                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "甯�"));
 
         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(), "鐪�"));
+                .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鐪�"));
         indexCountVO.setImpTypeCountVO(impTypeCountVO);
         return indexCountVO;
     }
@@ -807,19 +811,19 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result editProject(ProjectForm form) {
+        Long projectId = form.getProjectInfoForm().getId();
         if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
-
             if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
                 //鏂板
-                return ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm());
-
+                projectId = (Long) ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm()).get("data");
             } else {
                 //鏇存柊
-                return ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
+                ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
             }
         }
         if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
             if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) {
+                form.getProjectInvestmentInfoForm().setProjectId(projectId);
                 projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
             } else {
                 projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
@@ -827,6 +831,7 @@
         }
         if (ObjectUtil.isNotNull(form.getProjectInvestmentFundingForm())) {
             if (ObjectUtil.isNull(form.getProjectInvestmentFundingForm().getId())) {
+                form.getProjectInvestmentFundingForm().setProjectId(projectId);
                 projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
             } else {
                 projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
@@ -834,6 +839,7 @@
         }
         if (ObjectUtil.isNotNull(form.getProjectInvestmentPolicyComplianceForm())) {
             if (ObjectUtil.isNull(form.getProjectInvestmentPolicyComplianceForm().getId())) {
+                form.getProjectInvestmentPolicyComplianceForm().setProjectId(projectId);
                 projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
             } else {
                 projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
@@ -841,6 +847,7 @@
         }
         if (ObjectUtil.isNotNull(form.getProjectUnitRegistrationInfoForm())) {
             if (ObjectUtil.isNull(form.getProjectUnitRegistrationInfoForm().getId())) {
+                form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
                 projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
             } else {
                 projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());

--
Gitblit v1.8.0