ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -190,17 +190,17 @@ */ @ApiOperation("遗体器官获取伦理审查表") @GetMapping(value = "/download") public Result downloadInfo(String initiateId) throws IOException { if(ObjectUtils.isEmpty(initiateId)){ public Result downloadInfo(String nitiateId) throws IOException { if(ObjectUtils.isEmpty(nitiateId)){ return Result.error("nitiateId伦理审查id不能为空"); } EthicalReviewVO reviewVO =new EthicalReviewVO(); reviewVO.setNitiateId(initiateId); reviewVO.setNitiateId(nitiateId); List<EthicalReviewVO> list = serviceEthicalreviewopinionsService.selectVOList(reviewVO); if(list.size()==0){ return Result.error("伦理审查id无相关数据"); } EthicalreviewopinionsStateTotalVO stateTotalVO=serviceEthicalreviewopinionsService.stateTotalAll(initiateId); EthicalreviewopinionsStateTotalVO stateTotalVO=serviceEthicalreviewopinionsService.stateTotalAll(nitiateId); String filePath = getClass().getResource("/template/").getPath(); if(filePath.substring(0,1).equals("/")) filePath=filePath.substring(1); @@ -315,7 +315,7 @@ e.printStackTrace(); } String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis()); String name = "遗体器官获取伦理审查表_"+initiateId+"_" + newTime; String name = "遗体器官获取伦理审查表_"+nitiateId+"_" + newTime; String filePathData =RuoYiConfig.getProfile() + "/download/wordtemplate"; //创建文件夹 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorganBase.java
@@ -36,7 +36,7 @@ /** 分配状态:0:未分配;1:已分配;2作废 */ @ApiModelProperty("分配状态:0:未分配;1:已分配;2作废") @Excel(name = "分配状态:0:未分配;1:已分配;2作废") private Long allocationStatus; private String allocationStatus; /** 分配时间 */ @ApiModelProperty("分配时间") ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/DonateorganBaseInfoDTO.java
@@ -134,7 +134,7 @@ */ @ApiModelProperty("分配状态:0:未分配;1:已分配;2作废") @Excel(name = "分配状态:0:未分配;1:已分配;2作废") private Long allocationStatus; private String allocationStatus; /** * 分配时间 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonateorganBaseInfoVO.java
@@ -117,7 +117,7 @@ */ @ApiModelProperty("分配状态:0:未分配;1:已分配;2作废") @Excel(name = "分配状态:0:未分配;1:已分配;2作废") private Long allocationStatus; private String allocationStatus; /** * 分配时间 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/ServiceDonateorganBaseVO.java
@@ -44,7 +44,7 @@ */ @ApiModelProperty("分配状态:0:未分配;1:已分配;2作废") @Excel(name = "分配状态:0:未分配;1:已分配;2作废") private Long allocationStatus; private String allocationStatus; /** * 分配时间