|
@@ -13,10 +13,11 @@ import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectExtension
|
|
|
import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRegionRequest;
|
|
|
import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRequest;
|
|
|
import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse;
|
|
|
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
|
|
|
import cn.com.ty.lift.business.project.dao.mapper.ProjectHistoryMapper;
|
|
|
import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
|
|
|
import cn.com.ty.lift.common.base.ExportRequest;
|
|
|
-import cn.com.ty.lift.common.constants.ApiConstants;
|
|
|
+import cn.com.ty.lift.common.constants.CommonEnum;
|
|
|
import cn.com.ty.lift.common.export.ExportUtils;
|
|
|
import cn.com.ty.lift.common.utils.DateUtils;
|
|
|
import cn.com.xwy.boot.web.dto.RestResponse;
|
|
@@ -148,14 +149,28 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
|
|
|
return listByIds(projectIdList);
|
|
|
}
|
|
|
|
|
|
+ public Project getOne(Long id) {
|
|
|
+ QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("id", id);
|
|
|
+ return getOne(queryWrapper);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* @param id 项目id
|
|
|
* @return Project 项目详情
|
|
|
* @description 查询项目详情
|
|
|
* @date 2019/12/6 10:51 AM
|
|
|
*/
|
|
|
- public Project detail(Long id) {
|
|
|
- return projectMapper.selectById(id);
|
|
|
+ public Map<String, Object> detail(Long id) {
|
|
|
+ Project project = getOne(id);
|
|
|
+ List<ProjectUserResponse> userList = projectUserService.getUserList(id);
|
|
|
+ Optional<Long> userId = userList.stream().filter(user -> (
|
|
|
+ CommonEnum.DefaultRole.CLERK.getCode().equals(user.getUserRole())
|
|
|
+ )).map(ProjectUserResponse::getUserId).findFirst();
|
|
|
+ Map<String, Object> resultMap = new HashMap<>();
|
|
|
+ resultMap.put("project", project);
|
|
|
+ resultMap.put("userId", userId);
|
|
|
+ return resultMap;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -180,9 +195,9 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public RestResponse add(ProjectExtensionRequest request) {
|
|
|
Project project = request.getProject();
|
|
|
- if(project.getStartDate().isAfter(LocalDate.now())){
|
|
|
+ if (project.getStartDate().isAfter(LocalDate.now())) {
|
|
|
project.setProjectStatus("1");
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
project.setProjectStatus("2");
|
|
|
}
|
|
|
boolean ret = saveProject(project);
|