From ee2262faf471f901f33144703ce1e5de6dc5ac90 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 05 八月 2024 18:11:49 +0800
Subject: [PATCH] zjh 2024/08/02-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java | 16 ++++----
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 3 +
ltkj-admin/src/main/resources/application.yml | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 46 ++++++++++++----------
5 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index cc9253a..b4f9b15 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -1786,7 +1786,8 @@
}
//鑾峰彇浣撴寮傚父鏁�
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.between(TjOrder::getFinishTime, DateUtil.lastMonth(), DateUtil.now());
+ wq1.between(TjOrder::getCreateTime, DateUtil.lastMonth(), DateUtil.now());
+ wq1.isNotNull(TjOrder::getFinishTime);
wq1.eq(TjOrder::getCheckStatus, 1);
List<TjOrder> orderAbnormalCountList = orderService.list(wq1);
if (null != orderAbnormalCountList && orderAbnormalCountList.size() > 0) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
index a9503b5..f2772c4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
@@ -74,13 +74,13 @@
Date beginTime = DateUtils.parseDate(date + " 00:00:00");
Date endTime = DateUtils.parseDate(date + " 23:59:59");
QueryWrapper<TjOrder> queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.ge("finish_time", beginTime);
- queryWrapper1.lt("finish_time", endTime);
+ queryWrapper1.ge("create_time", beginTime);
+ queryWrapper1.lt("create_time", endTime);
queryWrapper1.eq("tj_type", 2);
Integer personCount = orderService.count(queryWrapper1);
QueryWrapper<TjOrder> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.ge("finish_time", beginTime);
- queryWrapper2.lt("finish_time", endTime);
+ queryWrapper2.ge("create_time", beginTime);
+ queryWrapper2.lt("create_time", endTime);
queryWrapper2.eq("tj_type", 1);
Integer teamCount = orderService.count(queryWrapper2);
@@ -100,14 +100,14 @@
Date beginTime = DateUtils.parseDate(formatdate + " 00:00:00");
Date endTime = DateUtils.parseDate(formatdate + " 23:59:59");
QueryWrapper<TjOrder> queryWrapper1 = new QueryWrapper<>();
- queryWrapper1.ge("finish_time", beginTime);
- queryWrapper1.lt("finish_time", endTime);
+ queryWrapper1.ge("create_time", beginTime);
+ queryWrapper1.lt("create_time", endTime);
queryWrapper1.eq("tj_type", 2);
Integer personCount = orderService.count(queryWrapper1);
QueryWrapper<TjOrder> queryWrapper2 = new QueryWrapper<>();
- queryWrapper2.ge("finish_time", beginTime);
- queryWrapper2.lt("finish_time", endTime);
+ queryWrapper2.ge("create_time", beginTime);
+ queryWrapper2.lt("create_time", endTime);
queryWrapper2.eq("tj_type", 1);
Integer teamCount = orderService.count(queryWrapper2);
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index f095d43..074b323 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -4,4 +4,4 @@
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
spring:
profiles:
- active: prod
\ No newline at end of file
+ active: dev
\ No newline at end of file
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index a1c5506..ea30b57 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -264,7 +264,7 @@
List<TjCustomer> customerList = customerService.list(wq);
if (null == customerList || customerList.size() == 0) {
//throw new ServiceException("鐧诲綍鐢ㄦ埛锛�" + username + " 涓嶅瓨鍦�");
- throw new ServiceException("璐︽埛鎴栧瘑鐮侀敊璇紝璇锋鏌ワ紒");
+ throw new ServiceException("璐﹀彿鎴栧瘑鐮侀敊璇紝璇锋鏌ワ紒");
}
for (TjCustomer tjCustomer : customerList) {
try {
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index 624d55e..b42e88c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -109,27 +109,31 @@
// List<Map<Object, Object>> getLine();
@Select("select aa.date,\n" +
- " sum(if(c.tj_type='鍥㈤槦', ifnull(c.coun,0),0)) as tdcoun,\n" +
- " sum(if(c.tj_type='涓汉', ifnull(c.coun,0),0)) as grcoun,\n" +
- " sum(if(c.tj_type='鎶ュ憡', ifnull(c.coun,0),0)) as bgcoun \n" +
- " from (\n" +
- " SELECT date_sub(CURDATE(),interval @i:=@i+1 day) as date\n" +
- " from (select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
- " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
- " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
- " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
- " select 1 union all select 1) as a,\n" +
- " (select @i:= -1) b) aa \n" +
- " left join (\n" +
- " select date_format(create_time, '%Y-%m-%d') dat, tj_type, count(*) coun\n" +
- " from tj_order where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
- " group by date_format(create_time, '%Y-%m-%d'),tj_type\n" +
- " union\n" +
- " select date_format(report_time, '%Y-%m-%d') dat, '鎶ュ憡' tj_type, count(*) coun\n" +
- " from tj_order where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
- " group by date_format(report_time, '%Y-%m-%d')\n" +
- " ) c on c.dat =aa.date\n" +
- "group by aa.date")
+ " sum(if(c.tj_type='1', ifnull(c.coun,0),0)) as tdcoun,\n" +
+ " sum(if(c.tj_type='2', ifnull(c.coun,0),0)) as grcoun,\n" +
+ " sum(if(c.tj_type='3', ifnull(c.coun,0),0)) as bgcoun \n" +
+ " from (\n" +
+ " SELECT date_sub(CURDATE(),interval @i:=@i+1 day) as date\n" +
+ " from (select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
+ " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
+ " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
+ " select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
+ " select 1 union all select 1) as a,\n" +
+ " (select @i:= -1) b) aa\n" +
+ " left join (\n" +
+ " select date_format(create_time, '%Y-%m-%d') dat, tj_type, count(*) coun\n" +
+ " from tj_order where deleted=0 AND tj_type=2 AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
+ " group by date_format(create_time, '%Y-%m-%d')\t\n" +
+ "\t\t\t\tunion\n" +
+ " select date_format(create_time, '%Y-%m-%d') dat,tj_type, count(*) coun\n" +
+ " from tj_order where deleted=0 AND tj_type=1 AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
+ " group by date_format(create_time, '%Y-%m-%d')\t\t\t\t\t\n" +
+ "\t\t\t\tunion\n" +
+ " select date_format(create_time, '%Y-%m-%d') dat, 3 tj_type, count(*) coun\n" +
+ " from tj_order where deleted=0 AND !ISNULL(report_time) AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
+ " group by date_format(create_time, '%Y-%m-%d')\n" +
+ " ) c on c.dat =aa.date\n" +
+ " group by aa.date")
List<LineChartsVo> getLine();
--
Gitblit v1.8.0