From 733264ad003542e110056b40b680101f1694b05f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 三月 2025 18:18:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 35 +++++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java | 5 ++
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 9 ++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantCountTrendVO.java | 22 +++++++++++
4 files changed, 70 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
index 6abb00a..86431c2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
@@ -1,11 +1,16 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.service.impl.ScreenService;
import com.ruoyi.system.vo.ScreenRentIncomeTrendVO;
import com.ruoyi.system.vo.ScreenRentRankVO;
import com.ruoyi.system.vo.ScreenTopStaticsDataVO;
+import com.ruoyi.system.vo.TenantCountTrendVO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
@@ -13,7 +18,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author mitao
@@ -40,4 +47,32 @@
public R<ScreenRentIncomeTrendVO> rentIncomeTrend() {
return R.ok(screenService.rentIncomeTrend());
}
+ private final TContractService contractService;
+
+
+ @GetMapping("/getTenantCountTrend")
+ @ApiModelProperty(value = "租户数量趋势统计")
+ public R<?> getTenantCountTrend() {
+ // 获取所有签约时间不为空的合同
+ List<TContract> contracts = contractService.list(new LambdaQueryWrapper<TContract>()
+ .isNotNull(TContract::getSignTime));
+
+ // 使用年-月格式化日期，并按此分组计算每个时间段的合同数量
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yy-M");
+
+ List<TenantCountTrendVO> trendData = contracts.stream()
+ .collect(Collectors.groupingBy(contract -> contract.getSignTime().toLocalDate()
+ .withDayOfMonth(1) // 将日期调整为该月的第一天，以便正确分组
+ .atStartOfDay()))
+ .entrySet().stream()
+ .map(entry -> {
+ String period = entry.getKey().format(formatter);
+ long count = entry.getValue().size();
+ return new TenantCountTrendVO(period, count);
+ })
+ .collect(Collectors.toList());
+
+ return R.ok(trendData);
+ }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 14257ff..39db30b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -149,6 +149,15 @@
@ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9 = 签订待审核")
@TableField("status")
private String status;
+
+ /**
+ * 签订时间
+ */
+ @ApiModelProperty(value = "签订时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("sign_time")
+ private LocalDateTime signTime;
+
@ApiModelProperty(value = "内存大小多个文件逗号拼接")
@TableField("memory")
private String memory;
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..777a0af 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
@@ -193,7 +193,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);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantCountTrendVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantCountTrendVO.java
new file mode 100644
index 0000000..75684bc
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantCountTrendVO.java
@@ -0,0 +1,22 @@
+package com.ruoyi.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("租户数量趋势统计")
+public class TenantCountTrendVO {
+ @ApiModelProperty(value = "日期")
+ private String date;
+ @ApiModelProperty(value = "租户数量")
+ private Long count;
+
+ public TenantCountTrendVO(String date, Long count) {
+ this.date = date;
+ this.count = count;
+ }
+
+ public TenantCountTrendVO() {
+ }
+}
--
Gitblit v1.7.1