最新版本541200007

jiangping

2024-12-02 2b72be7962e44d251fdecc8fdc6465ed7237536e

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

@@ -28,6 +28,7 @@
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.join.DeviceJoinMapper;
@@ -131,6 +132,8 @@

    @Autowired
    private EmayService emayService;



    @Override
    public Integer create(Visits visits) {
@@ -1261,10 +1264,7 @@
        QueryWrapper<Visits> wrapper = new QueryWrapper<>(visits);
        return visitsMapper.selectCount(wrapper);
    }


    @Override
    public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
    public static PageData<Visits> retentionPageBiz(PageWrap<Visits> pageWrap, VisitsJoinMapper visitsJoinMapper,SystemDictDataBiz systemDictDataBiz) {
        String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
        IPage<Visits> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
@@ -1276,9 +1276,7 @@
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
        queryWrapper.leftJoin(" member m on m.id= t.MEMBER_ID");

        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getLevelStatus()),Visits::getStatus,Constants.VisitStatus.signin);

        queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getLevelStatus())," TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) <= "+code+"  ");

        queryWrapper.ne("m.type ",Constants.TWO);
@@ -1305,6 +1303,11 @@
        }

        return PageData.from(result);
    }

    @Override
    public PageData<Visits> retentionPage(PageWrap<Visits> pageWrap) {
        return  retentionPageBiz(pageWrap,visitsJoinMapper,systemDictDataBiz);
    }


@@ -1658,25 +1661,28 @@

            pcWorkPlatformDataVO.setLwList(lwList   );
        }else if(Constants.equalsInteger(queryType,Constants.THREE)) {
            MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
            queryWrapper.selectAll(Notices.class);
            if (Objects.isNull(loginUserInfo.getMemberId())) {
                queryWrapper.eq("1", "2");
                pcWorkPlatformDataVO.setNoticesList(new ArrayList<>());
                pcWorkPlatformDataVO.setNoticesNum(0);
//                queryWrapper.eq("1", "2");
            } else {
                MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
                queryWrapper.selectAll(Notices.class);
                queryWrapper.eq(Notices::getStatus, Constants.ZERO);
                queryWrapper.eq(Notices::getSendacopy, Constants.ZERO);
                queryWrapper.eq(Notices::getParam2, Constants.ZERO);
                queryWrapper.eq(Notices::getUserId, loginUserInfo.getMemberId());
            }
            queryWrapper.orderByDesc(Notices::getCreateDate);
            List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper);
            pcWorkPlatformDataVO.setNoticesList(noticesList);
            pcWorkPlatformDataVO.setNoticesNum(noticesList.size());
            if(noticesList.size() > 5 ){
                pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5));
            }else{
                queryWrapper.orderByDesc(Notices::getCreateDate);
                List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper);
                pcWorkPlatformDataVO.setNoticesList(noticesList);
                pcWorkPlatformDataVO.setNoticesNum(noticesList.size());
                if(noticesList.size() > 5 ){
                    pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5));
                }else{
                    pcWorkPlatformDataVO.setNoticesList(noticesList);
                }
            }

        }else{
            String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
            MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();