From 2d0c245d5b5c9099969f7618bddbc3696ccfb6a9 Mon Sep 17 00:00:00 2001 From: luohairen <3399054449@qq.com> Date: 星期四, 28 十一月 2024 00:06:25 +0800 Subject: [PATCH] 修改项目计划bug --- business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 2 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 eeca686..5c18d4a 100644 --- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java @@ -3,19 +3,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.common.base.Result; +import com.ycl.domain.entity.File; import com.ycl.domain.entity.ProjectInfo; import com.ycl.domain.form.ProjectInfoForm; import com.ycl.domain.query.ProjectInfoQuery; -import com.ycl.domain.vo.ProjectInfoVO; +import com.ycl.domain.vo.*; import com.ycl.framework.utils.PageUtil; import com.ycl.mapper.ProjectInfoMapper; import com.ycl.service.ProjectInfoService; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -32,18 +37,25 @@ /** * 娣诲姞 + * * @param form * @return */ @Override + @Transactional(rollbackFor = Exception.class) public Result add(ProjectInfoForm form) { + //娣诲姞鍩烘湰淇℃伅 ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null); - baseMapper.insert(entity); +// baseMapper.insert(entity); + //娣诲姞鏂囦欢 + List<File> fileList = form.getFileList(); + return Result.ok("娣诲姞鎴愬姛"); } /** * 淇敼 + * * @param form * @return */ @@ -60,6 +72,7 @@ /** * 鎵归噺鍒犻櫎 + * * @param ids * @return */ @@ -71,6 +84,7 @@ /** * id鍒犻櫎 + * * @param id * @return */ @@ -82,6 +96,7 @@ /** * 鍒嗛〉鏌ヨ + * * @param query * @return */ @@ -94,6 +109,7 @@ /** * 鏍规嵁id鏌ユ壘 + * * @param id * @return */ @@ -106,6 +122,7 @@ /** * 鍒楄〃 + * * @return */ @Override @@ -116,4 +133,37 @@ .collect(Collectors.toList()); return Result.ok().data(vos); } + + @Override + public IndexCountVO getIndexCount(IndexDTO indexDTO) { + // {"proPhaseCountVO":[{"type":"鍌ㄥ瑙勫垝闃舵","count":0,"amount":"0.00","text":"鍌�"}, + // {"type":"椤圭洰鍓嶆湡闃舵","count":0,"amount":"0.00","text":"鏂�"}, + // {"type":"瀹炴柦闃舵","count":0,"amount":"0.00","text":"寤�"},{"type":"绔e伐鎶曠敤闃舵","count":0,"amount":"0.00","text":"绔�"}], + // "impTypeCountVO":[{"type":"涓�鑸」鐩�","count":0,"amount":"0.00","text":"鏅�"}, + // {"type":"鍘块噸鐐归」鐩�","count":0,"amount":"0.00","text":"鍘�"},{"type":"甯傞噸鐐归」鐩�","count":0,"amount":"0.00","text":"甯�"}, + // {"type":"鐪侀噸鐐归」鐩�","count":0,"amount":"0.00","text":"鐪�"}]}} + IndexCountVO indexCountVO = new IndexCountVO(); + List<IndexProPhaseCountVO> proPhaseCountVO = new ArrayList<>(); + proPhaseCountVO.add(new IndexProPhaseCountVO("鍌ㄥ瑙勫垝闃舵", 0, "0.00", "鍌�")); + proPhaseCountVO.add(new IndexProPhaseCountVO("椤圭洰鍓嶆湡闃舵", 0, "0.00", "鏂�")); + proPhaseCountVO.add(new IndexProPhaseCountVO("瀹炴柦闃舵", 0, "0.00", "寤�")); + proPhaseCountVO.add(new IndexProPhaseCountVO("绔e伐鎶曠敤闃舵", 0, "0.00", "绔�")); + List<IndexImpTypeCountVO> impTypeCountVO = new ArrayList<>(); + impTypeCountVO.add(new IndexImpTypeCountVO("涓�鑸」鐩�", 0, "0.00", "鏅�")); + impTypeCountVO.add(new IndexImpTypeCountVO("鍘块噸鐐归」鐩�", 0, "0.00", "鍘�")); + impTypeCountVO.add(new IndexImpTypeCountVO("甯傞噸鐐归」鐩�", 0, "0.00", "甯�")); + impTypeCountVO.add(new IndexImpTypeCountVO("鐪侀噸鐐归」鐩�", 0, "0.00", "鐪�")); + indexCountVO.setImpTypeCountVO(impTypeCountVO); + indexCountVO.setProPhaseCountVO(proPhaseCountVO); + + + return indexCountVO; + } + + @Override + public Map<String, Integer> countExceptionProject(IndexDTO indexDTO) { + Map<String, Integer> map = new HashMap<>(); + map.put("processExceptionProject", 0); + return map; + } } -- Gitblit v1.8.0