sinake
7 天以前 4a54dc2ce371d90d19b264238c32efc7b871c772
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -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());
                    }