修复bug

jiangping

2024-08-13 6765787baa5e0b771d71f865c4deb776367410c4

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

@@ -16,6 +16,7 @@
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;
@@ -23,12 +24,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.checkerframework.checker.units.qual.A;
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;
@@ -112,6 +113,11 @@

    @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());
        MPJLambdaWrapper<ProblemLog> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
@@ -123,8 +129,35 @@
                .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType());
        queryWrapper.orderByDesc(ProblemLog::getCreateDate);
        IPage<ProblemLog> problemLogIPage = problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper);
        System.out.println(problemLogIPage);
        return PageData.from(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);
            }
        }
        return voList;
    }

    @Override
@@ -146,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)){