From 160b87f6c1b93e5061f9556984c07c9cb45d04a6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 四月 2025 09:46:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 623ef3d..09ca4dc 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())
@@ -193,7 +199,10 @@
@Override
public Boolean updateContractAuditStatus(String projectId, Integer status) {
LambdaUpdateWrapper<TContract> contractLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
- contractLambdaUpdateWrapper.eq(TContract::getId, projectId).set(TContract::getStatus, status);
+ contractLambdaUpdateWrapper
+ .eq(TContract::getId, projectId)
+ .set(TContract::getStatus, status)
+ .set(TContract::getSignTime, LocalDateTime.now());
return this.update(contractLambdaUpdateWrapper);
}
@@ -202,7 +211,7 @@
* @return
*/
@Override
- public Integer getCurrentMonthRentCount() {
- return baseMapper.getCurrentMonthRentCount();
+ public Integer getCurrentMonthRentCount(String businessDeptId) {
+ return baseMapper.getCurrentMonthRentCount(businessDeptId);
}
}
--
Gitblit v1.7.1