Browse Source

modify:

1. 复核通过项目增加返回值;
tags/24110701
WendyYang 3 weeks ago
parent
commit
73bdc0ffd1
4 changed files with 18 additions and 5 deletions
  1. +2
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/open/controller/OpenApiMeetingController.java
  2. +2
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/open/controller/OpenApiProjectLibController.java
  3. +5
    -5
      hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java
  4. +9
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java

+ 2
- 0
hz-pm-api/src/main/java/com/hz/pm/api/open/controller/OpenApiMeetingController.java View File

@@ -8,6 +8,7 @@ import com.hz.pm.api.open.model.po.ReqMeetingExpertSignPO;
import com.hz.pm.api.open.model.vo.ExpertJudgeToMhVO;
import com.hz.pm.api.open.model.vo.MeetingExpertToMhDTO;
import com.ningdatech.basic.model.PageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -29,6 +30,7 @@ import java.util.List;
*/
@Slf4j
@Validated
@Api(tags = "专家会议开放接口")
@RestController
@RequestMapping("/open/api/meeting-expert-info")
@RequiredArgsConstructor


+ 2
- 0
hz-pm-api/src/main/java/com/hz/pm/api/open/controller/OpenApiProjectLibController.java View File

@@ -3,6 +3,7 @@ package com.hz.pm.api.open.controller;
import com.hz.pm.api.open.manage.OpenApiProjectLibManage;
import com.hz.pm.api.open.model.po.ReviewPassProjectListPO;
import com.hz.pm.api.open.model.vo.ReviewPassProjectInfoToMhVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@ import java.util.List;
* @since 10:43 2024/11/6
*/
@RestController
@Api(tags = "项目库开放接口管理")
@RequiredArgsConstructor
@RequestMapping("/open/api/projectLib")
public class OpenApiProjectLibController {


+ 5
- 5
hz-pm-api/src/main/java/com/hz/pm/api/open/manage/OpenApiProjectLibManage.java View File

@@ -1,16 +1,13 @@
package com.hz.pm.api.open.manage;

import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hz.pm.api.common.model.constant.ExistsSqlConst;
import com.hz.pm.api.common.util.BizDateUtil;
import com.hz.pm.api.common.util.BizUtils;
import com.hz.pm.api.open.model.po.ReviewPassProjectListPO;
import com.hz.pm.api.open.model.vo.ReviewPassProjectInfoToMhVO;
import com.hz.pm.api.open.model.vo.ReferSystemReplaceInfoToMhVO;
import com.hz.pm.api.open.model.vo.ReviewPassProjectInfoToMhVO;
import com.hz.pm.api.open.util.OpenApiCheckSignUtil;
import com.hz.pm.api.projectlib.entity.MhSystemReplaceInfo;
import com.hz.pm.api.projectlib.entity.ProjectGovSystemReplaceInfos;
@@ -59,7 +56,8 @@ public class OpenApiProjectLibManage {
sql.append(String.format(" and npsc.create_on >= '%s'", BizDateUtil.toDateStr(po.getReviewPassTime())));
}
Wrapper<Project> query = Wrappers.lambdaQuery(Project.class)
.select(Project::getProjectCode, Project::getProjectName, Project::getBuildOrgCode, Project::getBuildOrgName)
.select(Project::getProjectCode, Project::getProjectName, Project::getBuildOrgCode,
Project::getProjectYear, Project::getCreateOn, Project::getBuildOrgName)
.exists(sql.toString())
.eq(Project::getNewest, Boolean.TRUE)
.notIn(Project::getStage, ProjectStatus.CHANGE.getCode(), ProjectStatus.STOPPED.getCode())
@@ -86,6 +84,8 @@ public class OpenApiProjectLibManage {

return projects.stream().map(w -> {
ReviewPassProjectInfoToMhVO item = new ReviewPassProjectInfoToMhVO();
item.setCreateOn(w.getCreateOn());
item.setProjectYear(w.getProjectYear());
item.setProjectCode(w.getProjectCode());
item.setProjectName(w.getProjectName());
item.setBuildOrgCode(w.getBuildOrgCode());


+ 9
- 0
hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/ReviewPassProjectInfoToMhVO.java View File

@@ -1,8 +1,10 @@
package com.hz.pm.api.open.model.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.List;

/**
@@ -16,6 +18,13 @@ import java.util.List;
@Data
public class ReviewPassProjectInfoToMhVO {

@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createOn;

@ApiModelProperty("项目年份")
private Integer projectYear;

@ApiModelProperty("项目编码")
private String projectCode;



Loading…
Cancel
Save