访客系统
上一版本: c7bf8d9b | 补丁 | 提交 | 显示空白
jiangping
2025-03-10 cdd085a4900d528c2e5409b6dca719647951f0fe 
Merge remote-tracking branch 'origin/master'
已修改2个文件
4 ■■■■■ 文件已修改
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java


@@ -211,7 +211,7 @@


                .eq(pageWrap.getModel().getName() != null, PlatformBooks::getName, pageWrap.getModel().getName())


                .eq(pageWrap.getModel().getRemark() != null, PlatformBooks::getRemark, pageWrap.getModel().getRemark())


                .eq(pageWrap.getModel().getStatus() != null, PlatformBooks::getStatus, pageWrap.getModel().getStatus())


                .eq(pageWrap.getModel().getContractNum() != null, PlatformBooks::getContractNum, pageWrap.getModel().getContractNum())


                .like(pageWrap.getModel().getContractNum() != null, PlatformBooks::getContractNum, pageWrap.getModel().getContractNum())


                .ge(pageWrap.getModel().getArriveDate() != null, PlatformBooks::getArriveDate, Utils.Date.getStart(pageWrap.getModel().getArriveDate()))


                .le(pageWrap.getModel().getArriveDate() != null, PlatformBooks::getArriveDate, Utils.Date.getEnd(pageWrap.getModel().getArriveDate()))


                .eq(pageWrap.getModel().getInType() != null, PlatformBooks::getInType, pageWrap.getModel().getInType())




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


@@ -223,6 +223,7 @@




    @Override


    public List<PlatformJob> findList(PlatformJob platformJob) {


        platformJob.setIsdeleted(Constants.ZERO);


        QueryWrapper<PlatformJob> wrapper = new QueryWrapper<>(platformJob);


        return platformJobMapper.selectList(wrapper);


    }


@@ -247,6 +248,7 @@


                .leftJoin(PlatformWmsJob.class,PlatformWmsJob::getCarryBillCode,PlatformJob::getBillCode)


                .leftJoin(SystemUser.class,SystemUser::getId,PlatformJob::getOutUserId)


                .leftJoin(PlatformBooks.class,PlatformBooks::getJobId,PlatformJob::getId)


                .eq(PlatformJob::getIsdeleted,Constants.ZERO)


                .eq(pageWrap.getModel().getId() != null, PlatformJob::getId, pageWrap.getModel().getId())


                .eq(pageWrap.getModel().getCreator() != null, PlatformJob::getCreator, pageWrap.getModel().getCreator())


                .ge(pageWrap.getModel().getCreateDate() != null, PlatformJob::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()))