代码提交

liusheng

2024-03-05 0c5e744bd9b52147c7fc273ec8fe7bd7afea0ebb

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java

@@ -54,8 +54,9 @@
    @Autowired
    private IServiceRelativesconfirmationService serviceRelativesconfirmationService;

    //    @Autowired
//    private IServiceDonateflowchartService iServiceDonateflowchartService;
    @Autowired
    private IServiceFundflowruleService serviceFundflowruleService;

    @Autowired
    private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService;

@@ -273,13 +274,29 @@
        Map<String, Object> map = new ConcurrentHashMap<>();

        ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);

        if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
            return null;
        }

        //封装serviceDonateorgan潜在捐献数据
        Map<String, String> donatebaseinfo = new HashMap<>();
        donatebaseinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
        donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
        donatebaseinfo.put("createperson", null);
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCreateBy())) {
            ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
            serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getCreateBy());
            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
            donatebaseinfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
        }
        donatebaseinfo.put("updateperson", null);
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getUpdateBy())) {
            ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
            serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getUpdateBy());
            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
            donatebaseinfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
        }
        donatebaseinfo.put("process", "");
        //封装serviceDonateorgan潜在捐献返回数据
        map.put("donatebaseinfo", donatebaseinfo);
@@ -293,6 +310,20 @@
            if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
                medicalevaluation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getCreateTime()));
                medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null);
                medicalevaluation.put("createperson", null);
                if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    medicalevaluation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                medicalevaluation.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    medicalevaluation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }
                medicalevaluation.put("process", "");
            }
        }
@@ -308,6 +339,20 @@
            if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
                relativesconfirmation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getCreateTime()));
                relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : "");
                relativesconfirmation.put("createperson", null);
                if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    relativesconfirmation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                relativesconfirmation.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    relativesconfirmation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }
                relativesconfirmation.put("process", "");
            }
        }
@@ -324,6 +369,20 @@
            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("createperson", null);
                if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateflowcharts.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donateflowcharts.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateflowcharts.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donateflowcharts.put("process", "");
            }
        }
@@ -339,6 +398,21 @@
            if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
                donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
                donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");

                donateorgansService.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateorgansService.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donateorgansService.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateorgansService.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donateorgansService.put("process", "");
            }
        }
@@ -352,6 +426,22 @@
            if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
                donationwitness.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getCreateTime()));
                donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getUpdateTime()) : "");

                donationwitness.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonationwitness.getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonationwitness.getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donationwitness.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donationwitness.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonationwitness.getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonationwitness.getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donationwitness.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }

                donationwitness.put("process", "");
            }
        }
@@ -367,6 +457,22 @@
            if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
                donatecompletioninfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getCreateTime()));
                donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getUpdateTime()) : "");

                donatecompletioninfo.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donatecompletioninfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donatecompletioninfo.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donatecompletioninfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }

                donatecompletioninfo.put("process", "");
            }
        }
@@ -377,5 +483,3 @@
        return map;
    }
}