代码提交

liusheng

2024-02-27 e338114af5b96b3d7686ab9b424a9076b94611d3

 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", "");
            }
        }