From 7df0337148d9d6d6158ad93564aa2a3c827265cc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 15:17:15 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java | 8 ++++++--
ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserClinicExport.java | 5 +++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 9 ++++-----
ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserListExport.java | 4 +++-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java | 12 ++++++++++++
5 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
index 1550b2e..d2552ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
@@ -18,11 +18,9 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -65,9 +63,10 @@
try {
// 判断哪些诊所本月没有业绩达标
List<TCrmClinic> clinics = crmClinicService.list();
+ String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());
List<TErpProcurement> procurements = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)
.in(TErpProcurement::getStatus, Arrays.asList(3,4,5))
- .likeRight(TErpProcurement::getCreateTime, LocalDate.now()));
+ .likeRight(TErpProcurement::getCreateTime, monthDate));
for (TCrmClinic clinic : clinics) {
List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(clinic.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(procurementList)){
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserClinicExport.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserClinicExport.java
index 06370ec..6b0f820 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserClinicExport.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserClinicExport.java
@@ -7,6 +7,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDateTime;
@Data
@ApiModel(value = "慢性病患者管理列表导出诊所TSysAppUserClinicExport")
@@ -17,7 +18,7 @@
@Excel(name = "联系电话", width = 20)
private String phone;
- @Excel(name = "性别 1=男 2=女", width = 20,replace = {"男_1","女_2"})
+ @Excel(name = "性别 1=男 2=女", width = 20,replace = {"男_1","女_2","-_null"})
private Integer sex;
@Excel(name = "年龄", width = 20)
@@ -29,5 +30,5 @@
@Excel(name = "上次短信提醒时间", width = 20)
private String lastReminderTime;
private String chronicDiseaseId;
-
+ private LocalDateTime birthTime;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserListExport.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserListExport.java
index a04dd70..bc44dc4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserListExport.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/TSysAppUserListExport.java
@@ -7,6 +7,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDateTime;
@Data
@ApiModel(value = "慢性病患者管理列表导出平台TSysAppUserListExport")
@@ -17,7 +18,7 @@
@Excel(name = "联系电话", width = 20)
private String phone;
- @Excel(name = "性别 1=男 2=女", width = 20,replace = {"男_1","女_2"})
+ @Excel(name = "性别", width = 20,replace = {"男_1","女_2","-_null"})
private Integer sex;
@Excel(name = "年龄", width = 20)
@@ -26,5 +27,6 @@
@Excel(name = "慢性病名称拼接", width = 20)
private String sysChronicDiseaseNames;
private String chronicDiseaseId;
+ private LocalDateTime birthTime;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
index 973635f..75cc3da 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicServiceImpl.java
@@ -24,8 +24,10 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -56,10 +58,11 @@
}
List<String> clinicIds = list.stream().map(TCrmClinicVO::getId).collect(Collectors.toList());
+ String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());
List<TErpProcurement> procurements = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)
.in(TErpProcurement::getClinicId, clinicIds)
.in(TErpProcurement::getStatus, Arrays.asList(3,4,5))
- .likeRight(TErpProcurement::getCreateTime, LocalDate.now()));
+ .likeRight(TErpProcurement::getCreateTime, monthDate));
for (TCrmClinicVO tCrmClinicVO : list) {
List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(tCrmClinicVO.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(procurementList)){
@@ -144,10 +147,11 @@
}
List<String> clinicIds = list.stream().map(TCrmClinicListExport::getId).collect(Collectors.toList());
+ String monthDate = new SimpleDateFormat("yyyy-MM").format(new Date());
List<TErpProcurement> procurements = erpProcurementService.list(Wrappers.lambdaQuery(TErpProcurement.class)
.in(TErpProcurement::getClinicId, clinicIds)
.in(TErpProcurement::getStatus, Arrays.asList(3,4,5))
- .likeRight(TErpProcurement::getCreateTime, LocalDate.now()));
+ .likeRight(TErpProcurement::getCreateTime, monthDate));
for (TCrmClinicListExport crmClinicListExport : list) {
List<TErpProcurement> procurementList = procurements.stream().filter(procurement -> procurement.getClinicId().equals(crmClinicListExport.getId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(procurementList)){
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java
index 35f0595..f37ddc2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java
@@ -83,6 +83,10 @@
}
List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
for (TSysAppUserVO sysAppUserVO : list) {
+ if(sysAppUserVO.getBirthTime() != null){
+ long age = ChronoUnit.YEARS.between(sysAppUserVO.getBirthTime(), LocalDateTime.now());
+ sysAppUserVO.setAge(age);
+ }
String chronicDiseaseId = sysAppUserVO.getChronicDiseaseId();
if(StringUtils.isNotBlank(chronicDiseaseId)){
String[] split = chronicDiseaseId.split(",");
@@ -114,6 +118,10 @@
}
List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
for (TSysAppUserListExport sysAppUserListExport : list) {
+ if(sysAppUserListExport.getBirthTime() != null){
+ long age = ChronoUnit.YEARS.between(sysAppUserListExport.getBirthTime(), LocalDateTime.now());
+ sysAppUserListExport.setAge(age);
+ }
String chronicDiseaseId = sysAppUserListExport.getChronicDiseaseId();
if(StringUtils.isNotBlank(chronicDiseaseId)){
String[] split = chronicDiseaseId.split(",");
@@ -143,6 +151,10 @@
}
List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
for (TSysAppUserClinicExport sysAppUserClinicExport : list) {
+ if(sysAppUserClinicExport.getBirthTime() != null){
+ long age = ChronoUnit.YEARS.between(sysAppUserClinicExport.getBirthTime(), LocalDateTime.now());
+ sysAppUserClinicExport.setAge(age);
+ }
String chronicDiseaseId = sysAppUserClinicExport.getChronicDiseaseId();
if(StringUtils.isNotBlank(chronicDiseaseId)){
String[] split = chronicDiseaseId.split(",");
--
Gitblit v1.7.1