ll

liukangdong

2024-10-28 19f0eca493f7e17ab7b67d28cf77d80de364576c

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerLogServiceImpl.java

@@ -6,11 +6,14 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerLogMapper;
import com.doumee.dao.business.HiddenDangerMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.join.HiddenDangerLogJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.dao.business.model.HiddenDangerLog;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.HiddenDangerLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -38,7 +41,16 @@
    private HiddenDangerLogMapper hiddenDangerLogMapper;

    @Autowired
    private HiddenDangerMapper hiddenDangerMapper;

    @Autowired
    private HiddenDangerLogJoinMapper hiddenDangerLogJoinMapper;

    @Autowired
    private SystemUserMapper systemUserMapper;

    @Autowired
    private CompanyMapper companyMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
@@ -109,14 +121,43 @@
                        .eq(HiddenDangerLog::getIsdeleted, Constants.ZERO)
                        .orderByAsc(HiddenDangerLog::getCreateDate)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerLogList)){
            HiddenDanger hiddenDanger = hiddenDangerMapper.selectById(hiddenDangerLog.getHiddenDangerId());
            if(Objects.isNull(hiddenDanger)){
                return null;
            }
            if(hiddenDanger.getStatus().equals(Constants.ZERO)){
                //下一步处理人
                HiddenDangerLog newBean = new HiddenDangerLog();
                newBean.setCreateUserName("-");
                newBean.setCompanyName("-");
                newBean.setTitle("隐患处理");
                newBean.setAvatar("-");

        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
        for (HiddenDangerLog bean:hiddenDangerLogList) {
            if(StringUtils.isNotBlank(bean.getAvatar())){
                bean.setAvatar(path + bean.getAvatar());
                SystemUser systemUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
                if(Objects.nonNull(systemUser)){
                    newBean.setCreateUserName(systemUser.getRealname());
                    newBean.setAvatar(systemUser.getAvatar());
                    Company company = companyMapper.selectById(systemUser.getCompanyId());
                    if(Objects.nonNull(company)){
                        newBean.setCompanyName(company.getCompanyNamePath());
                    }
                }
                hiddenDangerLogList.add(newBean);
            }

            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();

            for (HiddenDangerLog bean:hiddenDangerLogList) {
                if(StringUtils.isNotBlank(bean.getAvatar() ) && bean.getAvatar().indexOf("HKIMG")<0 ){
                    bean.setAvatar(path + bean.getAvatar());
                }else{
                    bean.setAvatar(null);
                }
            }
        }

        return hiddenDangerLogList;
    }