From f692989d29ca3a76cb597fe0937cd5ee36811d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Thu, 10 Aug 2023 13:40:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=90=A8=E4=BD=8D=E5=B7=AE?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linkage-admin/src/main/resources/application-dev.yml | 8 ++++---- .../mapper/messageCenter/MessageCenterMapper.xml | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index dc94d755..3be9b752 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -17,11 +17,11 @@ spring: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid datasource: db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写) - host: 222.71.165.188 + host: 221.214.32.166 port: 3309 username: root - password: linus,.123 - db-name: sc-boot + password: qawsed,.123 + db-name: sc-product db-schema: #金仓达梦选填 prepare-url: #自定义url @@ -44,7 +44,7 @@ spring: # 生产环境 # host: 222.71.165.188 # 测试环境 - host: 101.34.35.69 + host: 222.71.165.188 port: 6379 password: qweasd,.123 timeout: 8000 #超时时间(单位：秒) diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml index 0527875f..d38c8be1 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/messageCenter/MessageCenterMapper.xml @@ -852,8 +852,7 @@ SELECT ( @i := @i + 1 ) AS Number, F_FullName AS FFullName, COUNT( b.id ) AS bangdan, - SUM( - Round( IF ( b.unit = '1', b.settlement / 1000, b.settlement ), 3 )) AS settlement, + Round( SUM(IF ( b.unit = '1', b.settlement / 1000, b.settlement )), 3 ) AS settlement, SUM( b.amount ) AS amout, SUM( b.amount ) - c.pay_price AS notPaypalAmounts, c.pay_price AS paypalamounts @@ -917,8 +916,7 @@ FROM LEFT JOIN ( SELECT COUNT( b.id ) AS bangdan, - SUM( - Round( IF ( b.unit = '1', b.settlement / 1000, b.settlement ), 3 )) AS settlement, + Round( SUM(IF ( b.unit = '1', b.settlement / 1000, b.settlement )), 3 ) AS settlement, a.department_id FROM jg_salesorder a