From 9703dd782af4d87af8a944a054aa133a699030a4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 22 二月 2025 20:23:34 +0800
Subject: [PATCH] 优化、bug
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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..7f9ff2e 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("椤圭洰鍚嶆垨椤圭洰鐮佸凡瀛樺湪");
+ return Result.error("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
}
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());
}
@@ -148,7 +148,6 @@
queryWrapper.eq("project_name", entity.getProjectName());
if (StringUtils.isNotEmpty(entity.getProjectCode())) {
- queryWrapper.or();
queryWrapper.eq("project_code", entity.getProjectCode());
}
@@ -195,7 +194,7 @@
entity.setUsedStatus(ProjectConstant.PASS);
}
if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
- return Result.error("椤圭洰鍚嶆垨椤圭洰鐮佸凡瀛樺湪");
+ return Result.error("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
}
//鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
@@ -471,7 +470,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 +479,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("绔ｅ伐鎶曠敤闃舵", 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 +502,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;
}
--
Gitblit v1.8.0