Browse Source

modify:

1. 增加项目建设方案盖章件;
tags/24093001
WendyYang 3 months ago
parent
commit
f2a8ddf781
3 changed files with 26 additions and 5 deletions
  1. +10
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/ProjectReviewController.java
  2. +13
    -5
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectReviewManage.java
  3. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/Project.java

+ 10
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/ProjectReviewController.java View File

@@ -5,6 +5,7 @@ import com.hz.pm.api.projectdeclared.manage.ProjectReviewManage;
import com.hz.pm.api.projectdeclared.model.req.ProjectReviewApplyReq; import com.hz.pm.api.projectdeclared.model.req.ProjectReviewApplyReq;
import com.hz.pm.api.projectdeclared.model.vo.ReviewProgressStatisticsVO; import com.hz.pm.api.projectdeclared.model.vo.ReviewProgressStatisticsVO;
import com.hz.pm.api.projectlib.model.req.ProjectListReq; import com.hz.pm.api.projectlib.model.req.ProjectListReq;
import com.hz.pm.api.projectlib.model.req.UploadConstructionPlanSealFileReq;
import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO; import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.model.PageVo;
import com.ningdatech.log.annotation.WebLog; import com.ningdatech.log.annotation.WebLog;
@@ -13,6 +14,8 @@ import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import javax.validation.Valid;

/** /**
* <p> * <p>
* ProjectReviewController * ProjectReviewController
@@ -36,6 +39,13 @@ public class ProjectReviewController {
projectReviewManage.projectReviewApply(req); projectReviewManage.projectReviewApply(req);
} }


@ApiOperation("上传项目建设方案盖章文件")
@WebLog("上传项目建设方案盖章文件")
@PostMapping("/uploadConstructionPlanSealFile")
public void uploadConstructionPlanSealFile(@Valid @RequestBody UploadConstructionPlanSealFileReq req) {
projectReviewManage.uploadConstructionPlanSealFile(req);
}

@ApiOperation("项目评审详情") @ApiOperation("项目评审详情")
@GetMapping("/detail/{projectId}") @GetMapping("/detail/{projectId}")
public ProjectReviewResultDTO projectReviewDetail(@PathVariable Long projectId) { public ProjectReviewResultDTO projectReviewDetail(@PathVariable Long projectId) {


+ 13
- 5
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ProjectReviewManage.java View File

@@ -1,6 +1,7 @@
package com.hz.pm.api.projectdeclared.manage; package com.hz.pm.api.projectdeclared.manage;


import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,6 +23,7 @@ import com.hz.pm.api.projectlib.model.entity.Project;
import com.hz.pm.api.projectlib.model.entity.ProjectInst; import com.hz.pm.api.projectlib.model.entity.ProjectInst;
import com.hz.pm.api.projectlib.model.enumeration.status.ProjectStatus; import com.hz.pm.api.projectlib.model.enumeration.status.ProjectStatus;
import com.hz.pm.api.projectlib.model.req.ProjectListReq; import com.hz.pm.api.projectlib.model.req.ProjectListReq;
import com.hz.pm.api.projectlib.model.req.UploadConstructionPlanSealFileReq;
import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO; import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
import com.hz.pm.api.projectlib.service.IProjectInstService; import com.hz.pm.api.projectlib.service.IProjectInstService;
import com.hz.pm.api.projectlib.service.IProjectService; import com.hz.pm.api.projectlib.service.IProjectService;
@@ -42,11 +44,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;


import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.time.LocalDateTime;
import java.util.*;


/** /**
* <p> * <p>
@@ -257,4 +256,13 @@ public class ProjectReviewManage {
return queryState; return queryState;
} }


public void uploadConstructionPlanSealFile(UploadConstructionPlanSealFileReq req) {
Wrapper<Project> wrapper = Wrappers.lambdaUpdate(Project.class)
.set(Project::getConstructionPlanSealFile, req.getConstructionPlanSealFile())
.set(Project::getUpdateOn, LocalDateTime.now())
.set(Project::getUpdateBy, LoginUserUtil.getUserId())
.eq(Project::getId, req.getProjectId());
projectService.update(wrapper);
}

} }

+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/entity/Project.java View File

@@ -293,6 +293,9 @@ public class Project implements Serializable {
@ApiModelProperty("建设方案文件") @ApiModelProperty("建设方案文件")
private String constructionPlanFile; private String constructionPlanFile;


@ApiModelProperty("建设方案文件(盖章)")
private String constructionPlanSealFile;

@ApiModelProperty("立项批复建设方案文件") @ApiModelProperty("立项批复建设方案文件")
private String approvedConstructionPlanFile; private String approvedConstructionPlanFile;




Loading…
Cancel
Save