diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/MeetingExpertInfoVO.java b/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/MeetingExpertInfoVO.java new file mode 100644 index 0000000..6f4c9c4 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/open/model/vo/MeetingExpertInfoVO.java @@ -0,0 +1,49 @@ +package com.hz.pm.api.open.model.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * 外部调用接口会议专家信息实体 + * + * @author CMM + * @since 2024/05/10 17:16 + */ +@Data +public class MeetingExpertInfoVO { + + + /** + * 会议信息 + */ + + @ApiModelProperty("会议ID") + private Long meetingId; + + @ApiModelProperty("会议开始时间") + private LocalDateTime startTime; + + @ApiModelProperty("会议结束时间") + private LocalDateTime endTime; + + @ApiModelProperty("会议名称") + private String meetingName; + + @ApiModelProperty("会议地址") + private String meetingAddress; + + @ApiModelProperty("联系人") + private String connecter; + + @ApiModelProperty("联系方式") + private String contact; + + /** + * 专家信息列表 + */ + @ApiModelProperty("专家信息列表") + private List expertInfoList; +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java index 00304ca..b016a02 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/controller/PurchaseController.java @@ -139,8 +139,8 @@ public class PurchaseController { @GetMapping("/xcfhxReportFiles/{code}") @ApiOperation("获取信创文件预览") - public void xcfhxReportFiles(@PathVariable String code) { - purchaseManage.xcfhxReportFiles(code); + public String xcfhxReportFiles(@PathVariable String code) { + return purchaseManage.xcfhxReportFiles(code); } @GetMapping("/exportXcfhFile/{code}") diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java index ef2de33..e4c9fc8 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java @@ -833,8 +833,8 @@ public class PurchaseManage { throw BizException.wrap("新增失败"); } - public void xcfhxReportFiles(String code) { - mhXchxFileHelper.getXchxFile(code, null); + public String xcfhxReportFiles(String code) { + return mhXchxFileHelper.getXchxFile(code, null); } public void exportXcfhFile(String code,HttpServletResponse response) {