From 380efb1e727d51c9080a91bd7aad6a063081bb45 Mon Sep 17 00:00:00 2001 From: yupeng <roc__yu@163.com> Date: 星期三, 09 四月 2025 12:31:25 +0800 Subject: [PATCH] feat: 1.修改统计跟随查询变化 2.修改账单分页查询排序,新增按状态排序权重表 3.新增修改账单金额接口 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 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..dd04199 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())); @@ -208,4 +212,11 @@ public Integer getCurrentMonthRentCount() { return baseMapper.getCurrentMonthRentCount(); } + + @Override + public PageInfo<TContract> queryPage(TContractQuery query) { + PageInfo<TContract> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); + pageInfo = this.baseMapper.page(pageInfo,query); + return pageInfo; + } } -- Gitblit v1.7.1