From 40d262e091d43b15c082260b7279daf4e89b2799 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期五, 29 十一月 2024 07:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 84 ++++++++++++++++++++++++++++++++----------
1 files changed, 64 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 05a25e8..3adc8f2 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,10 +1,14 @@
package com.ycl.service.impl;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
import com.ycl.common.enums.business.FileTypeEnum;
+import com.ycl.common.enums.business.ProjectCategoryEnum;
+import com.ycl.common.utils.CopyUtils;
+import com.ycl.common.utils.DateUtils;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.File;
import com.ycl.domain.entity.ProjectInfo;
@@ -39,6 +43,7 @@
private final ProjectInfoMapper projectInfoMapper;
private final FileService fileService;
private final FileMapper fileMapper;
+
/**
* 娣诲姞
*
@@ -56,7 +61,7 @@
baseMapper.insert(entity);
//娣诲姞鏂囦欢
List<File> fileList = form.getFileList();
- fileList.forEach(item->{
+ fileList.forEach(item -> {
item.setBusId(entity.getId());
item.setType(FileTypeEnum.PROJECT_INFO);
});
@@ -76,20 +81,21 @@
ProjectInfo entity = baseMapper.selectById(form.getId());
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- ProjectInfoForm.getEntityByForm(form,entity);
+ ProjectInfoForm.getEntityByForm(form, entity);
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
//鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
List<File> fileList = form.getFileList();
- fileList.forEach(item->{
+ fileList.forEach(item -> {
+ item.setId(null);
item.setBusId(entity.getId());
item.setType(FileTypeEnum.PROJECT_INFO);
});
//鍒犻櫎鍘熸湁鏂囦欢
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
- fileQueryWrapper.eq("type",FileTypeEnum.PROJECT_INFO.getType());
- fileQueryWrapper.eq("bus_id",entity.getId());
+ fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
+ fileQueryWrapper.eq("bus_id", entity.getId());
fileMapper.delete(fileQueryWrapper);
//鏇挎崲鎴愮幇鏈�
fileService.saveBatch(fileList);
@@ -130,17 +136,54 @@
*/
@Override
public Result page(ProjectInfoQuery query) {
- IPage<ProjectInfo> page = PageUtil.getPage(query, ProjectInfo.class);
+ if (query.getProjectStartTime() != null) {
+ query.setProjectStartTime(DateUtils.getDayStart(query.getProjectStartTime()));
+ }
+ if (query.getProjectEndTime() != null) {
+ query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
+ }
+ String projectCategory = query.getProjectCategory();
+ if (ProjectCategoryEnum.RESERVE.getType().equals(projectCategory)) {
+ query.setProjectStatus(ProjectCategoryEnum.RESERVE.getStatus());
+ query.setReserveOrPrevious(ProjectCategoryEnum.RESERVE.getCode());
+ } else if (ProjectCategoryEnum.PREVIOUS.getType().equals(projectCategory)) {
+ query.setProjectStatus(ProjectCategoryEnum.PREVIOUS.getStatus());
+ query.setReserveOrPrevious(ProjectCategoryEnum.PREVIOUS.getCode());
+ } else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
+ query.setProjectStatus(ProjectCategoryEnum.FINISH.getStatus());
+ } else if (ProjectCategoryEnum.EXCEPTION.getType().equals(projectCategory)) {
+ //TODO
+ //鍏堟煡鍑哄紓甯告祦绋嬫垨鑰呭紓甯歌繘搴︽垨鑰呭紓甯歌鍒掔殑projectId鍜屽紓甯哥绫�
+ //閫氳繃projectId鏌ュ嚭椤圭洰鏁版嵁
+ //琛ュ厖鐩稿簲鐨勫紓甯告暟鎹紙寮傚父绉嶇被銆佸紓甯告祦绋嬭妭鐐圭瓑锛�
+ List<ProjectVO> list = new ArrayList<>();
+ return Result.ok().data(list).total(0);
+ }
+
+ IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
baseMapper.getPage(page, query);
- List<ProjectInfo> records = page.getRecords();
- List<ProjectInfoVO> list = records.stream()
- .map(entity -> {
- ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
+ List<ProjectInfoVO> records = page.getRecords();
+ List<ProjectVO> list = new ArrayList<>();
+ records.forEach(vo -> {
+ ProjectInfoVO.transform(vo);
vo.setProjectColorCode("green");
- return vo;
- })
- .collect(Collectors.toList());
+ ProjectVO projectVO = new ProjectVO();
+ copyToProjectVO(vo,projectVO);
+ //缈昏瘧椤圭洰闃舵
+ String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null);
+ projectVO.setProjectPhase(phase);
+ list.add(projectVO);
+ });
return Result.ok().data(list).total(page.getTotal());
+ }
+
+ private void copyToProjectVO(ProjectInfoVO vo,ProjectVO projectVO) {
+ //蹇界暐null鍊肩殑澶嶅埗
+ CopyUtils.copyNoNullProperties(vo, projectVO);
+ if(vo.getProjectInvestmentFunding()!=null) CopyUtils.copyNoNullProperties(vo.getProjectInvestmentFunding(),projectVO);
+ if(vo.getProjectInvestmentInfo()!=null) CopyUtils.copyNoNullProperties(vo.getProjectInvestmentInfo(),projectVO);
+ if(vo.getProjectUnitRegistrationInfo()!=null) CopyUtils.copyNoNullProperties(vo.getProjectUnitRegistrationInfo(),projectVO);
+ if(vo.getProjectInvestmentPolicyCompliance()!=null) CopyUtils.copyNoNullProperties(vo.getProjectInvestmentPolicyCompliance(),projectVO);
}
/**
@@ -155,8 +198,8 @@
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
- fileQueryWrapper.eq("type",FileTypeEnum.PROJECT_INFO.getType());
- fileQueryWrapper.eq("bus_id",vo.getId());
+ fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
+ fileQueryWrapper.eq("bus_id", vo.getId());
List<File> files = fileMapper.selectList(fileQueryWrapper);
vo.setFileList(files);
return Result.ok().data(vo);
@@ -213,8 +256,8 @@
public Result docDetail(Integer id) {
DocumentInfoForm documentInfoForm = new DocumentInfoForm();
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
- fileQueryWrapper.eq("type",FileTypeEnum.DOCUMENT_INFO.getType());
- fileQueryWrapper.eq("bus_id",id);
+ fileQueryWrapper.eq("type", FileTypeEnum.DOCUMENT_INFO.getType());
+ fileQueryWrapper.eq("bus_id", id);
List<File> files = fileMapper.selectList(fileQueryWrapper);
documentInfoForm.setFileList(files);
return Result.ok().data(documentInfoForm);
@@ -223,14 +266,15 @@
@Override
public Result addDoc(DocumentInfoForm form) {
List<File> fileList = form.getFileList();
- fileList.forEach(item->{
+ fileList.forEach(item -> {
+ item.setId(null);
item.setBusId(form.getProjectId());
item.setType(FileTypeEnum.DOCUMENT_INFO);
});
//鍒犻櫎鍘熸湁鏂囦欢
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
- fileQueryWrapper.eq("type",FileTypeEnum.DOCUMENT_INFO.getType());
- fileQueryWrapper.eq("bus_id",form.getProjectId());
+ fileQueryWrapper.eq("type", FileTypeEnum.DOCUMENT_INFO.getType());
+ fileQueryWrapper.eq("bus_id", form.getProjectId());
fileMapper.delete(fileQueryWrapper);
//鏇挎崲鎴愮幇鏈�
fileService.saveBatch(fileList);
--
Gitblit v1.8.0