ruoyi-admin/src/main/resources/application-druid.yml

@@ -69,7 +69,7 @@
            multi-statement-allow: true
  redis:
    # 地址、密码、端口（默认为6379）：开发环境
    host: 127.0.0.1
    host: 192.168.100.10
    password: Smartor
    port: 6020


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

@@ -398,15 +398,15 @@
        //封装伦理审查
        Map<String, String> donateflowcharts = new HashMap<>();
        //if (serviceDonatebaseinfo.getWorkflow() >= 3) {
            ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
            ServiceEthicalreviewinitiate serviceDonateflowchart = new ServiceEthicalreviewinitiate();
            serviceDonateflowchart.setInfoid(id);
            List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
            List<ServiceEthicalreviewinitiate> serviceEthicalreviewopinionsList = iServiceEthicalreviewinitiateService.queryList(serviceDonateflowchart);
            log.info("检查serviceEthicalreviewopinionsList的值为：{}", serviceEthicalreviewopinionsList.size());
            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);
                donateflowcharts.put("state", StringUtils.nullTo1(serviceEthicalreviewopinionsList.get(0).getReceiveStatus()));
                donateflowcharts.put("state", StringUtils.nullTo1(serviceEthicalreviewopinionsList.get(0).getStatus()));
                if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceEthicalreviewopinionsList.get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
@@ -432,25 +432,25 @@
        //封装器官分配
        Map<String, Object> donateorgansService = new HashMap<>();
       // if (serviceDonatebaseinfo.getWorkflow() >= 4) {
            ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
            ServiceDonateorganBase serviceDonateorgan = new ServiceDonateorganBase();
            serviceDonateorgan.setInfoid(id);
            List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
            log.info("检查serviceDonateorgans的值为：{}", serviceDonateorgans.size());
            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()) : "");
            Page<ServiceDonateorganBase> serviceDonateorgans = serviceDonateorganBaseService.queryList(serviceDonateorgan);
            log.info("检查serviceDonateorgans的值为：{}", serviceDonateorgans.getRecords().size());
            if (serviceDonateorgans.getRecords().size()>0) {
                donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.getRecords().get(0).getCreateTime()));
                donateorgansService.put("updatetime", serviceDonateorgans.getRecords().get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.getRecords().get(0).getUpdateTime()) : "");
                donateorgansService.put("createperson", null);
                donateorgansService.put("state", StringUtils.nullTo1(serviceDonateorgans.get(0).getAllocationstatus()));
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getCreateBy());
                donateorgansService.put("state", StringUtils.nullTo1(serviceDonateorgans.getRecords().get(0).getAllocationStatus()));
                if (StringUtils.isNotBlank(serviceDonateorgans.getRecords().get(0).getCreateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.getRecords().get(0).getCreateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donateorgansService.put("createperson", sysUser.getNickName());
                    }

                }
                donateorgansService.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getUpdateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.get(0).getUpdateBy());
                if (StringUtils.isNotBlank(serviceDonateorgans.getRecords().get(0).getUpdateBy())) {
                    SysUser sysUser = sysUserMapper.selectUserByUserName(serviceDonateorgans.getRecords().get(0).getUpdateBy());
                    if (!ObjectUtils.isEmpty(sysUser)) {
                        donateorgansService.put("updateperson", sysUser.getNickName());
                    }