From e338114af5b96b3d7686ab9b424a9076b94611d3 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 27 二月 2024 17:45:28 +0800 Subject: [PATCH] 代码提交 --- ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java index da479a1..2acbe3e 100644 --- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java +++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java @@ -54,8 +54,10 @@ @Autowired private IServiceRelativesconfirmationService serviceRelativesconfirmationService; + // @Autowired +// private IServiceDonateflowchartService iServiceDonateflowchartService; @Autowired - private IServiceDonateflowchartService iServiceDonateflowchartService; + private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService; @Autowired private IServiceOrganallocationService serviceOrganallocationService; @@ -316,12 +318,12 @@ //灏佽浼︾悊瀹℃煡 Map<String, String> donateflowcharts = new HashMap<>(); if (serviceDonatebaseinfo.getWorkflow() >= 3) { - ServiceDonateflowchart serviceDonateflowchart = new ServiceDonateflowchart(); + ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions(); serviceDonateflowchart.setInfoid(id); - List<ServiceDonateflowchart> serviceDonateflowcharts = iServiceDonateflowchartService.queryList(serviceDonateflowchart); - if (!CollectionUtils.isEmpty(serviceDonateflowcharts)) { - donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateflowcharts.get(0).getCreateTime())); - donateflowcharts.put("updatetime", serviceDonateflowcharts.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateflowcharts.get(0).getUpdateTime()) : ""); + List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart); + if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) { + donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime())); + donateflowcharts.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : ""); donateflowcharts.put("process", ""); } } -- Gitblit v1.9.3