diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusPdSjVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusPdSjVo.java new file mode 100644 index 00000000..feb16c5c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusPdSjVo.java @@ -0,0 +1,13 @@ +package org.dromara.bigscreen.domain.vo; + + +import lombok.Data; + +@Data +public class BusPdSjVo { + private Long wdpdrw; + private Long qtbmpd; + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxSjDateVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxSjDateVo.java new file mode 100644 index 00000000..353ee83e --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxSjDateVo.java @@ -0,0 +1,10 @@ +package org.dromara.bigscreen.domain.vo; + +import lombok.Data; + +@Data +public class BusWjzxSjDateVo { + + private Long zjsc; + private Long zs; +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/IBusWjzxService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/IBusWjzxService.java index 7073390b..b5ba1442 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/IBusWjzxService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/IBusWjzxService.java @@ -1,6 +1,7 @@ package org.dromara.bigscreen.service; import org.dromara.bigscreen.domain.dto.BusWjzxBo; +import org.dromara.bigscreen.domain.vo.BusWjzxSjDateVo; import org.dromara.bigscreen.domain.vo.BusWjzxVo; import org.dromara.bigscreen.domain.BusWjzx; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -33,7 +34,12 @@ public interface IBusWjzxService extends IService{ * @param pageQuery 分页参数 * @return 文件中心分页列表 */ - TableDataInfo queryPageList(BusWjzxBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(BusWjzxBo bo, PageQuery pageQuery); /** + * 分页查询文件中心列表 + * + * @return 文件中心分页列表 + */ + BusWjzxSjDateVo queryWjzx(); /** * 查询符合条件的文件中心列表 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java index d0d277e9..1c7c9b3c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.bigscreen.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.dromara.bigscreen.domain.dto.BusWjzxBo; +import org.dromara.bigscreen.domain.vo.BusWjzxSjDateVo; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; @@ -14,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.biddingManagement.biddingDocument.domain.XzdBiddingFileEstimate; import org.dromara.xzd.biddingManagement.biddingDocument.domain.vo.XzdBiddingFileEstimateVo; @@ -24,6 +26,7 @@ import org.dromara.bigscreen.domain.BusWjzx; import org.dromara.bigscreen.mapper.BusWjzxMapper; import org.dromara.bigscreen.service.IBusWjzxService; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; @@ -68,6 +71,17 @@ public class BusWjzxServiceImpl extends ServiceImpl impl return TableDataInfo.build(result); } + @Override + public BusWjzxSjDateVo queryWjzx() { + BusWjzxSjDateVo busWjzxSjDateVo = new BusWjzxSjDateVo(); + Long zjsc = baseMapper.selectCount(new LambdaQueryWrapper().ge(BusWjzx::getCreateTime, LocalDate.now())); + Long zs = this.count(); + busWjzxSjDateVo.setZs(zs); + busWjzxSjDateVo.setZjsc(zjsc); + + return busWjzxSjDateVo; + } + /** * 查询符合条件的文件中心列表 * diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/IPdMasterService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/IPdMasterService.java index 5fabc428..2a8820fb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/IPdMasterService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/IPdMasterService.java @@ -1,5 +1,6 @@ package org.dromara.patch.service; +import org.dromara.bigscreen.domain.vo.BusPdSjVo; import org.dromara.patch.domain.bo.PdMasterProgressReq; import org.dromara.patch.domain.vo.PdMasterBymiAndQt; import org.dromara.patch.domain.vo.PdMasterProgressVo; @@ -88,4 +89,12 @@ public interface IPdMasterService extends IService{ * @return 派单列表 */ PdMasterBymiAndQt queryPageListBy(PdMasterBo bo, PageQuery pageQuery); + + + /** + * 查询派单列表 + * + * @return 派单列表 + */ + BusPdSjVo queryPageListByDate(); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java index e6bfe132..b0ebd54c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java @@ -2,6 +2,7 @@ package org.dromara.patch.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.dromara.bigscreen.domain.vo.BusPdSjVo; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -238,6 +239,20 @@ public class PdMasterServiceImpl extends ServiceImpl i return res; } + @Override + public BusPdSjVo queryPageListByDate() { + BusPdSjVo res = new BusPdSjVo(); + // 获取登陆人 + Long userId = LoginHelper.getUserId(); + //获取我派发的 + Long l = baseMapper.selectCount(new LambdaQueryWrapper().eq(PdMaster::getCreateBy, userId)); + //其他部门派发给我的 + Long count = pdMasterUserService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(PdMasterUser::getSlaveid, userId)); + res.setWdpdrw(l); + res.setQtbmpd(count); + return res; + } + private List pdJudge(Integer flow ,List records) { if (records == null || records.size() == 0) return records;