From d4f0772a26c5d96ebc87996922c40e23bcd63dbd Mon Sep 17 00:00:00 2001
From: fumeiai <fumeiai@linzikg.com>
Date: Fri, 22 May 2020 17:05:52 +0800
Subject: [PATCH] add mysql online url

---
 .idea/workspace.xml                              | 9 ++++++---
 src/main/resources/application-dev.yml           | 2 +-
 src/main/resources/application-prod.yml          | 8 ++++----
 src/main/resources/logback-spring.xml            | 2 +-
 src/main/resources/mapper/generator/StaffDao.xml | 2 +-
 target/classes/application-dev.yml               | 2 +-
 target/classes/application-prod.yml              | 8 ++++----
 target/classes/mapper/generator/StaffDao.xml     | 2 +-
 8 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index effe3682..cf883cc3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/lz/modules/app/service/impl/StaffServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/generator/StaffDao.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -158,7 +160,8 @@
       <workItem from="1588161274115" duration="1691000" />
       <workItem from="1588163384182" duration="74761000" />
       <workItem from="1588936950753" duration="95758000" />
-      <workItem from="1590038091791" duration="37467000" />
+      <workItem from="1590038091791" duration="38394000" />
+      <workItem from="1590136970394" duration="1139000" />
     </task>
     <servers />
   </component>
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index c499bc7e..77e06a5c 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://172.16.157.238:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+            url: jdbc:mysql://101.37.106.150:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
             username: ldd_biz
             password: Hello1234
             initial-size: 10
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 9a6c2cb5..8bee87c7 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -3,9 +3,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-            username: renren
-            password: 123456
+            url: jdbc:mysql://rm-bp1xhc66ruz72t68p.mysql.rds.aliyuncs.com:3306/lz_manger?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+            username: lz_manger
+            password: N8zfBwhOC
             initial-size: 10
             max-active: 100
             min-idle: 10
@@ -46,4 +46,4 @@ spring:
 #      driver-class-name: org.postgresql.Driver
 #      url: jdbc:postgresql://localhost:5432/renren_security
 #      username: renren
-#      password: 123456
\ No newline at end of file
+#      password: 123456
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 8cd99cce..3c3c33fa 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -8,7 +8,7 @@
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO" />
-<!--        <logger name="com.lz.modules.app.dao" level="DEBUG" />-->
+        <logger name="com.lz.modules.app.dao" level="DEBUG" />
         <logger name="io.lz" level="DEBUG" />
     </springProfile>
 
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 63e918fc..b123ba5d 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -98,7 +98,7 @@
 
 
     <select id="getStaffInfos" resultType="com.lz.modules.app.Dto.StaffDto">
-        select ls.id staffId,if(lso.employee_no=null, lso.staff_no,lso.employee_no) staff_no,ls.name,lso.position,
+        select ls.id staffId,if(lso.employee_no='', lso.staff_no,lso.employee_no) staff_no,ls.name,lso.position,
         case lso.staff_status when 0 then '在职' else '离职' end staff_status,
         if(ls.employee_id in (select leader_employee_id from lz_departments where is_delete=0
         <if test="departmentId != null and departmentId != ''">
diff --git a/target/classes/application-dev.yml b/target/classes/application-dev.yml
index c499bc7e..77e06a5c 100644
--- a/target/classes/application-dev.yml
+++ b/target/classes/application-dev.yml
@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://172.16.157.238:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+            url: jdbc:mysql://101.37.106.150:3306/lz_management?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
             username: ldd_biz
             password: Hello1234
             initial-size: 10
diff --git a/target/classes/application-prod.yml b/target/classes/application-prod.yml
index 9a6c2cb5..8bee87c7 100644
--- a/target/classes/application-prod.yml
+++ b/target/classes/application-prod.yml
@@ -3,9 +3,9 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-            username: renren
-            password: 123456
+            url: jdbc:mysql://rm-bp1xhc66ruz72t68p.mysql.rds.aliyuncs.com:3306/lz_manger?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+            username: lz_manger
+            password: N8zfBwhOC
             initial-size: 10
             max-active: 100
             min-idle: 10
@@ -46,4 +46,4 @@ spring:
 #      driver-class-name: org.postgresql.Driver
 #      url: jdbc:postgresql://localhost:5432/renren_security
 #      username: renren
-#      password: 123456
\ No newline at end of file
+#      password: 123456
diff --git a/target/classes/mapper/generator/StaffDao.xml b/target/classes/mapper/generator/StaffDao.xml
index aa73be06..63e918fc 100644
--- a/target/classes/mapper/generator/StaffDao.xml
+++ b/target/classes/mapper/generator/StaffDao.xml
@@ -159,7 +159,7 @@
         ifnull(round(count(DISTINCT(td.leader_employee_id))/count(DISTINCT(ls.id))*100,2),0) managementRate,
         count(DISTINCT(ls.new_staff)) newStaffCount,
         count(DISTINCT(ls.leave_staff)) leaveStaffCount,
-        ifnull(round(count(DISTINCT(ls.leave_staff))/(count(DISTINCT(ls.leave_staff))+count(DISTINCT(ls.id)))*100,2),0)
+        ifnull(round(count(DISTINCT(ls.leave_staff))/(count(DISTINCT(ls.leave_staff))+count(DISTINCT(ls.nowin_staff)))*100,2),0)
         leaveRate
         from
         (select * from lz_staff ll