syh преди 4 години
родител
ревизия
7fa39e79ad
променени са 2 файла, в които са добавени 11 реда и са изтрити 11 реда
  1. 8 7
      src/main/java/cn/com/ctop/okr/mapper/xml/OkrKrInfoMapper.xml
  2. 3 4
      src/main/resources/application.yml

+ 8 - 7
src/main/java/cn/com/ctop/okr/mapper/xml/OkrKrInfoMapper.xml

@@ -4,19 +4,20 @@
 
     <select id="getKrByObjectId" resultType="cn.com.ctop.okr.entity.OkrKrInfo">
         select
-        *
+            *
         from
-        okr_kr_info
+            okr_kr_info
         where
-        object_id = #{objectId}
+            object_id = #{objectId}
         and
-        user_id = #{userId}
+            user_id = #{userId}
         and
-        year = #{year}
+            year = #{year}
         and
-        quarter = #{quarter}
+            quarter = #{quarter}
         and
-        status = 1
+            status = 1
+        order by completion
     </select>
 
     <insert id="insertBatchOkrKrInfo">

+ 3 - 4
src/main/resources/application.yml

@@ -84,12 +84,11 @@ spring:
           username: hcst
           password: test@20190531
           driver-class-name: com.mysql.jdbc.Driver
-
   #redis 配置
   redis:
     database: 0
-#    host: 127.0.0.1
-    host: 172.30.0.17
+    host: 127.0.0.1
+#    host: 172.30.0.17
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -97,7 +96,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: foobared
+#    password: foobared
     port: 6379