From 5e0cc128324ecc24aa7cd6b0c690261a18b53d48 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 01 Jul 2024 17:22:21 +0800
Subject: [PATCH] 项目进度统计图柱状图v20240701
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
index 3e37962..4cec098 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbProjectServiceImpl.java
@@ -6,13 +6,17 @@
import cn.gistack.sm.sjztmd.entity.TbProjectSchedule;
import cn.gistack.sm.sjztmd.excel.TbProjectExcel;
import cn.gistack.sm.sjztmd.mapper.TbProjectMapper;
+import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.ITbProjectScheduleService;
import cn.gistack.sm.sjztmd.service.ITbProjectService;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsParams;
+import cn.gistack.sm.sjztmd.statisticsVO.StatisticsPie;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTable;
import cn.gistack.sm.sjztmd.statisticsVO.StatisticsTableProject;
import cn.gistack.sm.sjztmd.util.CalculateUtils;
+import cn.gistack.sm.sjztmd.vo.StatisticsPrice;
+import cn.gistack.sm.sjztmd.vo.StatisticsPriceVO;
import cn.gistack.sm.sjztmd.vo.TbProjectVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,6 +25,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
@@ -35,6 +40,8 @@
private final ITbProjectScheduleService tbProjectScheduleService;
private final IAttResBaseService attResBaseService;
+ @Autowired
+ private IAttAdBaseService iAttAdBaseService;
@Override
public Object getList(TbProjectVO tbProjectVO, IPage<TbProjectVO> page) {
@@ -52,6 +59,11 @@
tbProjectDTO.setUpdateUser(AuthUtil.getUserId().toString());
tbProjectDTO.setUpdateTime(DateUtil.now());
+ if(tbProjectDTO.getIsFill().equals("0")){
+ tbProjectDTO.setCheckState("0");
+ }else if(tbProjectDTO.getIsFill().equals("1")){
+ tbProjectDTO.setCheckState("1");
+ }
//更新项目表
boolean update = updateById(tbProjectDTO);
@@ -154,12 +166,34 @@
@Override
public boolean updatecheckState(String id,String checkState) {
TbProject tbProject = getById(id);
-
-
- if(tbProject != null){
- tbProject.setCheckState(checkState);
- return saveOrUpdate(tbProject);
+ if(checkState.equals("0")){
+ tbProject.setIsFill(checkState);
}
- return false;
+ tbProject.setCheckState(checkState);
+ return saveOrUpdate(tbProject);
+ }
+
+ @Override
+ public StatisticsPrice statisticsPie(StatisticsParams statisticsParams) {
+
+ AttAdBase ywxtAdDetail = iAttAdBaseService.getYwxtAdDetail(statisticsParams.getAdCode());
+ if (ywxtAdDetail.getAdGrad().equals("1")) {
+ StatisticsPrice statisticsPie =baseMapper.getStatisticsPie(statisticsParams);
+ return statisticsPie;
+ }
+ StatisticsPrice statisticsPie =baseMapper.getStatisticsPies(statisticsParams);
+
+ return statisticsPie;
+ }
+
+ @Override
+ public List<StatisticsPriceVO> statisticsBar(StatisticsParams statisticsParams) {
+ AttAdBase ywxtAdDetail = iAttAdBaseService.getYwxtAdDetail(statisticsParams.getAdCode());
+ if (ywxtAdDetail.getAdGrad().equals("1")) {
+ List<StatisticsPriceVO> statisticsPieBar =baseMapper.getStatisticsPieBar(statisticsParams);
+ return statisticsPieBar;
+ }
+ List<StatisticsPriceVO> statisticsPieBar =baseMapper.getStatisticsPieBars(statisticsParams);
+ return statisticsPieBar;
}
}
--
Gitblit v1.9.3