Browse Source

调班bug修复。

zhengqiang 4 years ago
parent
commit
8851fb81c8

+ 1 - 1
common/src/main/java/com/jpsoft/shinestar/modules/base/service/impl/WorkOverServiceImpl.java

@@ -460,7 +460,7 @@ public class WorkOverServiceImpl implements WorkOverService {
 
 		try {
 			//查询当前打卡时间是否在加班时段内
-			WorkOverPerson workOverPerson = workOverPersonService.findByPersonIdAndOffsetMinute(personId, recordTime, -60, 180);
+			WorkOverPerson workOverPerson = workOverPersonService.findByPersonIdAndOffsetMinute(personId, recordTime, -60, 60);
 			WorkOver workOver = workOverService.get(workOverPerson.getWorkOverId());
 
 			//记录加班人员加班完成时间

+ 7 - 7
web/src/main/resources/application-dev.yml

@@ -5,24 +5,24 @@ server:
 
 spring:
   datasource:
-#     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/shine_star?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-#     username: root
-#     password: jpsoft2016
+     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/shine_star?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft2016
      #测试环境下
      #url: jdbc:log4jdbc:mysql://47.92.161.104:3336/jp_.shinestar._2.0?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
      #username: root
      #password: jpsoft8121234
      #正式环境下
-     url: jdbc:log4jdbc:mysql://223.75.170.44:3366/shine_star?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft8121234
+#     url: jdbc:log4jdbc:mysql://223.75.170.44:3366/shine_star?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft8121234
   devtools:
     add-properties: false
     restart:
       enabled: true
   rabbitmq:
     host: 119.36.146.59
-    virtual-host: shinestar-dev
+    virtual-host: tomatozq
 
 logger:
   level: WARN