修复bug

jiangping

2024-08-13 6765787baa5e0b771d71f865c4deb776367410c4

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

@@ -10,21 +10,26 @@
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.ProblemLogMapper;
import com.doumee.dao.business.join.ProblemLogJoinMapper;
import com.doumee.dao.business.join.RetentionJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.ProblemLog;
import com.doumee.dao.business.model.Retention;
import com.doumee.dao.system.vo.ProblemLogVo;
import com.doumee.dao.web.reqeust.FinishAnswerDTO;
import com.doumee.service.business.ProblemLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.checkerframework.checker.units.qual.A;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -45,6 +50,9 @@

    @Autowired
    private CompanyMapper companyMapper;

    @Autowired
    private ProblemLogJoinMapper problemLogJoinMapper;

    @Override
    public Integer create(ProblemLog problemLog) {
@@ -105,65 +113,51 @@

    @Override
    public PageData<ProblemLog> findPage(PageWrap<ProblemLog> pageWrap) {
        IPage<ProblemLog> problemLogIPage = dataInfo(pageWrap);
        return PageData.from(problemLogIPage);
    }

    private IPage<ProblemLog> dataInfo(PageWrap<ProblemLog> pageWrap) {
        IPage<ProblemLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<ProblemLog> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<ProblemLog> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(ProblemLog::getId, pageWrap.getModel().getId());
        queryWrapper.leftJoin(Member.class,Member::getId,ProblemLog::getUserId);
        queryWrapper.selectAll(ProblemLog.class)
                .selectAs(Member::getType,ProblemLog::getType)
                .like(StringUtils.isNotBlank(pageWrap.getModel().getName()), ProblemLog::getName, pageWrap.getModel().getName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName())
                .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType());
        queryWrapper.orderByDesc(ProblemLog::getCreateDate);
        IPage<ProblemLog> problemLogIPage = problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper);
        return problemLogIPage;
    }

    @Override
    public List<ProblemLogVo> findPageExcel(PageWrap<ProblemLog> pageWrap) {
        IPage<ProblemLog> problemLogIPage = dataInfo(pageWrap);
        List<ProblemLogVo> voList = new ArrayList<>();
        if(null != problemLogIPage && problemLogIPage.getRecords().size() > 0) {
            for (ProblemLog obj:problemLogIPage.getRecords()) {
                ProblemLogVo vo = new ProblemLogVo();
                vo.setName(obj.getName());
                vo.setPhone(obj.getPhone());
                vo.setCompanyName(obj.getCompanyName());
                if(null != obj.getType()) {
                    if(Constants.ZERO == obj.getType()){
                        vo.setTypeName(Constants.Status.LW_FK.getDes());
                    }else if(Constants.ONE == obj.getType()) {
                        vo.setTypeName(Constants.Status.PT_FK.getDes());
                    }else {
                        vo.setTypeName(Constants.Status.NB_FK.getDes());
                    }
                }else {
                    vo.setTypeName("");
                }
                vo.setCreateDate(obj.getCreateDate());
                voList.add(vo);
            }
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(ProblemLog::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(ProblemLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(ProblemLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(ProblemLog::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(ProblemLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(ProblemLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(ProblemLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(ProblemLog::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getUserId() != null) {
            queryWrapper.lambda().eq(ProblemLog::getUserId, pageWrap.getModel().getUserId());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(ProblemLog::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getLogId() != null) {
            queryWrapper.lambda().eq(ProblemLog::getLogId, pageWrap.getModel().getLogId());
        }
        if (pageWrap.getModel().getScore() != null) {
            queryWrapper.lambda().eq(ProblemLog::getScore, pageWrap.getModel().getScore());
        }
        if (pageWrap.getModel().getContent() != null) {
            queryWrapper.lambda().eq(ProblemLog::getContent, pageWrap.getModel().getContent());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(ProblemLog::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getPhone() != null) {
            queryWrapper.lambda().eq(ProblemLog::getPhone, pageWrap.getModel().getPhone());
        }
        if (pageWrap.getModel().getCompanyId() != null) {
            queryWrapper.lambda().eq(ProblemLog::getCompanyId, pageWrap.getModel().getCompanyId());
        }
        if (pageWrap.getModel().getCompanyName() != null) {
            queryWrapper.lambda().eq(ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName());
        }
        if (pageWrap.getModel().getOpenid() != null) {
            queryWrapper.lambda().eq(ProblemLog::getOpenid, pageWrap.getModel().getOpenid());
        }
        queryWrapper.select("problem_log.*,(select type from member where member.openid = problem_log.openid) as type");
        queryWrapper.orderByAsc("problem_log.createDate");
        return PageData.from(problemLogMapper.selectPage(page, queryWrapper));
        return voList;
    }

    @Override
@@ -185,6 +179,7 @@
        problemLog.setCreateDate(new Date());
        problemLog.setIsdeleted(Constants.ZERO);
        problemLog.setStatus(Constants.ZERO);
        problemLog.setOpenid(finishAnswerDTO.getOpenId());
        if(finishAnswerDTO.getUseType().equals(Constants.ZERO)&&StringUtils.isNotBlank(finishAnswerDTO.getUserId())){
            Member member = memberMapper.selectById(finishAnswerDTO.getUserId());
            if(Objects.isNull(member)){