考勤

ruoyi-admin/src/main/java/com/ruoyi/web/controller/kaoqin/KaoQinController.java

@@ -660,10 +660,12 @@ public class KaoQinController extends BaseController {
             String zz = "0%";
             BigDecimal countBd = new BigDecimal(count);
             BigDecimal num = new BigDecimal(mapCount.get(s));
-            BigDecimal percentage = num.multiply(new BigDecimal("100"))
-                    .divide(countBd, 3, RoundingMode.HALF_UP) // 先计算百分比并保留三位小数以处理可能的精度问题
-                    .setScale(1, RoundingMode.HALF_UP);     // 再设置为一位小数
-            zz = percentage + "%";
+            if (countBd.compareTo(BigDecimal.ZERO) != 0 ) {
+                BigDecimal percentage = num.multiply(new BigDecimal("100"))
+                        .divide(countBd, 3, RoundingMode.HALF_UP) // 先计算百分比并保留三位小数以处理可能的精度问题
+                        .setScale(1, RoundingMode.HALF_UP);     // 再设置为一位小数
+                zz = percentage + "%";
+            }
             mapZj.put("bfb", zz);
             mapTj.put(s, mapZj);
         }

ruoyi-admin/src/main/resources/application-prod.yml

@@ -44,7 +44,7 @@ spring:
         # 数据库索引
         database: 12
         # 密码
-        password: D3fQYAsw
+        password: 1o02@Nlf+v
         # 连接超时时间
         timeout: 10s
         lettuce:

ruoyi-admin/src/main/resources/application.yml

@@ -19,8 +19,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
-    #active: prod
+    #active: druid
+    active: prod
   # 文件上传
   servlet:
      multipart:
@@ -78,8 +78,8 @@ xss:
 mqtt:
   #  server-uri: tcp://13.229.167.76:1883
   #server-uri: tcp://60.171.161.56:20009
-  server-uri: tcp://13.229.167.76:1883
-  #  server-uri: tcp://127.0.0.1:1883
+  #server-uri: tcp://13.229.167.76:1883
+  server-uri: tcp://127.0.0.1:1883
   client-id: JavaClientBoman
   username: admin
   password: 9o0p(O)P

ruoyi-system/src/main/java/com/ruoyi/system/domain/KaoqinRecord.java

@@ -95,22 +95,22 @@ public class KaoqinRecord extends BaseEntity
 
     /** 打卡时间 -上午上班 */
     @JsonFormat(pattern = "HH:mm:ss")
-    @Excel(name = "打卡时间 -上午上班", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "打卡时间 -上午上班", width = 30, dateFormat = "HH:mm:ss")
     private Date kaTimeAmIn;
 
     /** 打卡时间 -上午下班 */
     @JsonFormat(pattern = "HH:mm:ss")
-    @Excel(name = "打卡时间 -上午下班", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "打卡时间 -上午下班", width = 30, dateFormat = "HH:mm:ss")
     private Date kaTimeAmOut;
 
     /** 打卡时间 -下午上班 */
     @JsonFormat(pattern = "HH:mm:ss")
-    @Excel(name = "打卡时间 -下午上班", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "打卡时间 -下午上班", width = 30, dateFormat = "HH:mm:ss")
     private Date kaTimePmIn;
 
     /** 打卡时间 -下午下班 */
     @JsonFormat(pattern = "HH:mm:ss")
-    @Excel(name = "打卡时间 -下午下班", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "打卡时间 -下午下班", width = 30, dateFormat = "HH:mm:ss")
     private Date kaTimePmOut;
 
     /** 打卡类别-上午上班 1正常 2:迟到 3:外勤 4:早退  */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KaoqinRecordServiceImpl.java

@@ -155,10 +155,10 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
         KaoqinConfig kaoqinConfig = kaoqinConfigMapper.selectKaoqinConfigBynew();
         if (kaoqinRecord == null) {
             //根据id查询人员信息
-            SysUser sysUser = sysUserMapper.selectUserById(Long.getLong(userId));
+            SysUser sysUser = sysUserMapper.selectUserById(Long.parseLong(userId));
             String[] dates = date.split("-");
             KaoqinRecord kaoqinRecords = new KaoqinRecord();
-            kaoqinRecords.setUserId(Long.getLong(userId));
+            kaoqinRecords.setUserId(Long.parseLong(userId));
             kaoqinRecords.setUserName(sysUser.getNickName());
             kaoqinRecords.setPhone(sysUser.getPhonenumber());
             kaoqinRecords.setDeptId(sysUser.getDeptId());
@@ -174,7 +174,7 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
             //判断是否在上班卡之前打卡
             if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmIn()), "HH:mm:ss") <= 0) {
                 //在上班之前打卡
-                kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time));
+                kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
                 kaoqinRecords.setKaTypeAmIn(ONE);
                 kaoqinRecords.setKaStatus(ONE);
 
@@ -186,33 +186,33 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
                     if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()), "HH:mm:ss") >= 0) {
                         //正常下班
                         kaoqinRecords.setKaTypeAmIn(FIVE);
-                        kaoqinRecords.setKaTimePmOut(DateUtils.parseDate(time));
+                        kaoqinRecords.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecords.setKaTypePmOut(ONE);
                     } else {
                         //迟到
-                        kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time));
+                        kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecords.setKaTypeAmIn(TWO);
                     }
 
                 } else if (FOUR.equals(kaoqinConfig.getKaNum())) {
                     if (DateUtils.isInTimeRange(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmIn()), DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmOut()))) {
                         //迟到
-                        kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time));
+                        kaoqinRecords.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecords.setKaTypeAmIn(TWO);
 
                     } else if (DateUtils.isInTimeRange(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmOut()), DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmIn()))) {
                         //上午正常下班 打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退
                         kaoqinRecords.setKaTypeAmIn(FIVE);
-                        kaoqinRecords.setKaTimeAmOut(DateUtils.parseDate(time));
+                        kaoqinRecords.setKaTimeAmOut(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecords.setKaTypeAmOut(ONE);
-                        kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time));
+                        kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecord.setKaTypePmIn(ONE);
 
                     } else if (DateUtils.isInTimeRange(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmIn()), DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()))) {
                         //下午迟到 打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退
                         kaoqinRecords.setKaTypeAmIn(FIVE);
                         kaoqinRecords.setKaTypeAmOut(FIVE);
-                        kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time));
+                        kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecord.setKaTypePmIn(TWO);
 
                     } else if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()), "HH:mm:ss") >= 0) {
@@ -220,7 +220,7 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
                         kaoqinRecords.setKaTypeAmIn(FIVE);
                         kaoqinRecords.setKaTypeAmOut(FIVE);
                         kaoqinRecord.setKaTypePmIn(FIVE);
-                        kaoqinRecords.setKaTimePmOut(DateUtils.parseDate(time));
+                        kaoqinRecords.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecords.setKaTypePmOut(ONE);
                     }
                 }
@@ -229,7 +229,7 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
         } else {
             if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmIn()), "HH:mm:ss") <= 0) {
                 //在上班之前打卡
-                kaoqinRecord.setKaTimeAmIn(DateUtils.parseDate(time));
+                kaoqinRecord.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
                 kaoqinRecord.setKaTypeAmIn(ONE);
                 kaoqinRecord.setKaStatus(ONE);
 
@@ -237,11 +237,11 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
                 if (TWO.equals(kaoqinConfig.getKaNum())) {
                     if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()), "HH:mm:ss") >= 0) {
                         //正常下班
-                        kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time));
+                        kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecord.setKaTypePmOut(ONE);
                     } else {
                         //早退
-                        kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time));
+                        kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecord.setKaTypePmOut(FOUR);
                     }
 
@@ -249,37 +249,37 @@ public class KaoqinRecordServiceImpl implements IKaoqinRecordService {
                     if (DateUtils.isInTimeRange(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmIn()), DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmOut()))) {
                         if (StringUtils.isNotBlank(kaoqinRecord.getKaTypeAmIn())) {
                             //早退 打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退
-                            kaoqinRecord.setKaTimeAmOut(DateUtils.parseDate(time));
+                            kaoqinRecord.setKaTimeAmOut(DateUtils.parseDate(time.split(" ")[1]));
                             kaoqinRecord.setKaTypeAmOut(FOUR);
                         } else {
                             //迟到
-                            kaoqinRecord.setKaTimeAmIn(DateUtils.parseDate(time));
+                            kaoqinRecord.setKaTimeAmIn(DateUtils.parseDate(time.split(" ")[1]));
                             kaoqinRecord.setKaTypeAmIn(TWO);
                         }
 
                     } else if (DateUtils.isInTimeRange(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimeAmOut()), DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmIn()))) {
                         if (StringUtils.isNotBlank(kaoqinRecord.getKaTypeAmOut())) {
                             //下午正常上班 打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退
-                            kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time));
+                            kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time.split(" ")[1]));
                             kaoqinRecord.setKaTypePmIn(ONE);
                         } else {
                             //上午正常下班
-                            kaoqinRecord.setKaTimeAmOut(DateUtils.parseDate(time));
+                            kaoqinRecord.setKaTimeAmOut(DateUtils.parseDate(time.split(" ")[1]));
                             kaoqinRecord.setKaTypeAmOut(ONE);
                         }
                     } else if (DateUtils.isInTimeRange(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmIn()), DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()))) {
                         if (StringUtils.isNotBlank(kaoqinRecord.getKaTypePmIn())) {
                             //下午早退
-                            kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time));
+                            kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
                             kaoqinRecord.setKaTypePmOut(FOUR);
                         } else {
                             //下午迟到 打卡类别-上午下班 1正常 2:迟到 3:外勤 4:早退
-                            kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time));
+                            kaoqinRecord.setKaTimePmIn(DateUtils.parseDate(time.split(" ")[1]));
                             kaoqinRecord.setKaTypePmIn(TWO);
                         }
                     } else if (DateUtils.compareTimes(time.split(" ")[1], DateUtils.parseDateToStr("HH:mm:ss", kaoqinConfig.getKaTimePmOut()), "HH:mm:ss") >= 0) {
                         //下午正常下班
-                        kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time));
+                        kaoqinRecord.setKaTimePmOut(DateUtils.parseDate(time.split(" ")[1]));
                         kaoqinRecord.setKaTypePmOut(ONE);
                     }
                 }