Переглянути джерело

Merge branch 'V2.0.1' into test

zhaoxian 3 роки тому
батько
коміт
1260c6e56e

+ 4 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/live/controller/LiveDataAccountsController.java

@@ -98,20 +98,20 @@ public class LiveDataAccountsController {
     public Result<Object> add(@RequestBody LiveDataAccounts liveDataAccounts) {
         try {
             if (Check.isNull(liveDataAccounts.getLiveAccountId())) {
-                return Result.ok("缺少数据,请输入账户ID");
+                return Result.error("缺少数据,请输入账户ID");
             } else if (Check.isNull(liveDataAccounts.getLiveAccountName())) {
-                return Result.ok("缺少数据,请输入账户名称");
+                return Result.error("缺少数据,请输入账户名称");
             }
             LiveDataAccounts accounts = liveDataAccountsService.getById(liveDataAccounts.getLiveAccountId());
             if (!Check.isNull(accounts)) {
-                return Result.ok("该账户ID已注册,账户名:" + accounts.getLiveAccountName());
+                return Result.error("该账户ID已注册,账户名:" + accounts.getLiveAccountName());
             }
             QueryWrapper<LiveDataAccounts> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("live_account_name", liveDataAccounts.getLiveAccountName());
             queryWrapper.eq("state", "1").last("limit 1");
             LiveDataAccounts one = liveDataAccountsService.getOne(queryWrapper);
             if (!Check.isNull(one)) {
-                return Result.ok("该账户名称已存在,请重新命名");
+                return Result.error("该账户名称已存在,请重新命名");
             }
             liveDataAccounts.setStatDate(DateUtils.date2Str());
             liveDataAccountsService.save(liveDataAccounts);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/oa/modules/mapper/xml/WechatNoListMapper.xml

@@ -21,7 +21,7 @@
         when ck.checkin_type ='上班打卡'and ck.exception_type ='时间异常' then
         CONCAT(TIMESTAMPDIFF(MINUTE,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d '),'09:36:00'),'%Y-%m-%d %H:%i:%s'),ck.checkin_time)+1,' min')
         when ck.checkin_type ='下班打卡'and ck.exception_type ='时间异常' then
-        CONCAT(TIMESTAMPDIFF(MINUTE,ck.checkin_time,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d '),'19:00:00'),'%Y-%m-%d %H:%i:%s')),' min')
+        CONCAT(TIMESTAMPDIFF(MINUTE,ck.checkin_time,DATE_FORMAT(CONCAT(DATE_FORMAT(ck.checkin_time,'%Y-%m-%d '),'18:30:00'),'%Y-%m-%d %H:%i:%s')),' min')
         end AS stateDuration
         FROM ctop_wechat_user_list AS us
         LEFT JOIN ctop_wechat_department AS dpt ON us.depart_id = dpt.depart_id

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/oa/modules/service/impl/WechatCheckinDataServiceImpl.java

@@ -107,7 +107,7 @@ public class WechatCheckinDataServiceImpl extends ServiceImpl<WechatCheckinDataM
                                 Long dateStamp = DateUtils.timeToStamp(dateStr + " 21:30:00"); // 每天九点半时间戳
                                 if (checkinTimeStamp >= dateStamp) {
                                     checkinData.setOvertimeOrNot(1);
-                                    String overtimeStr = DateUtils.formatDate(checkDate) + " 19:00:00";
+                                    String overtimeStr = DateUtils.formatDate(checkDate) + " 18:30:00";
                                     Long overtimeStamp = DateUtils.timeToStamp(overtimeStr); // 每天九点半时间戳
                                     Double overtime = Double.valueOf(checkinTimeStamp - overtimeStamp) / 3600;
                                     checkinData.setOvertime(overtime);