From 592ac14eba76040426f590d8eb079fc75e968b84 Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期五, 28 三月 2025 19:18:37 +0800 Subject: [PATCH] 1.租户数量趋势统计 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java index 777a0af..b8c2b1d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.ProcessCategoryEnum; import com.ruoyi.common.utils.DictUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.system.bo.ProcessStartBO; import com.ruoyi.system.dto.SignContractDTO; @@ -34,6 +35,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,7 +69,9 @@ @Override public PageInfo<TContract> contractList(TContractQuery query) { PageInfo<TContract> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); - List<TContract> list = this.baseMapper.contractList(query,pageInfo); + //获取当前登录用户信息 + String businessDeptId = SecurityUtils.getBusinessDeptId(); + List<TContract> list = this.baseMapper.contractList(query,pageInfo,businessDeptId); for (TContract tContract : list) { tContract.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType())); tContract.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,tContract.getStatus())); @@ -88,7 +92,9 @@ PageInfo<TContract> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TContract> list = this.baseMapper.contractAppletList(query,pageInfo); for (TContract tContract : list) { - tContract.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,tContract.getPayType())); + tContract.setPayType( + DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE, tContract.getPayType()) + ); tContract.setStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_STATUS,tContract.getStatus())); FlwHisTask flwHisTask = flwHisTaskMapper.selectOne(new LambdaQueryWrapper<FlwHisTask>() .like(FlwHisTask::getVariable, tContract.getId()) -- Gitblit v1.7.1