From df1b0194375f13c640a0fc26a4fb82a65d48727f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 13 Aug 2021 14:50:10 +0800
Subject: [PATCH] 1.研判分析接口修改
---
src/main/java/org/springblade/modules/record/entity/Record.java | 1 +
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 6 ++----
src/main/resources/application-dev.yml | 2 +-
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml | 1 +
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 8bdbc51..71bb57e 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -154,8 +154,7 @@
IFNULL(A.amount, 0) AS lastamount,
IFNULL(B.amount, 0) AS thisamount
FROM (
- SELECT COUNTb.
- (*) AS lastmonth,
+ SELECT COUNT(*) AS lastmonth,
amount,
deptid
FROM
@@ -176,8 +175,7 @@
deptid
) A
left JOIN (
- SELECT COUNT
- (*) AS thismouth,
+ SELECT COUNT(*) AS thismouth,
amount,
deptid
FROM
diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index 9773d67..db2331f 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -148,5 +148,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
private String deptid;
+ private String examinetime;
}
diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index 1e5d72c..361fa1d 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -24,6 +24,7 @@
<result column="offices" property="offices"/>
<result column="officetime" property="officetime"/>
<result column="deptid" property="deptid"/>
+ <result column="examinetime" property="examinetime"/>
</resultMap>
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index eb9ac58..4ecf79c 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,7 +13,7 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://localhost:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: zhba0728
# PostgreSQL
--
Gitblit v1.9.3