新增考勤打卡,打卡配置

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

@@ -95,9 +95,11 @@ public class KaoQinController extends BaseController {
              String dictLabel = sysDictDatum.getDictLabel();
              //获取异常的值
             String dictValue = sysDictDatum.getDictValue();
-            Long aLong = 0L;
-            aLong =  collect.get(dictValue);
-            map.put(dictLabel,aLong);
+            if (!"1".equals(dictValue)){
+                Long aLong = 0L;
+                aLong =  collect.get(dictValue);
+                map.put(dictLabel,aLong);
+            }
         }
         map.put("count",kaoqinRecords.size());
         return AjaxResult.success(map);

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

@@ -82,7 +82,7 @@ public class KaoqinRecordController extends BaseController
      * 修改考勤记录
      */
     @Log(title = "考勤记录", businessType = BusinessType.UPDATE)
-    @PostMapping("put")
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody KaoqinRecord kaoqinRecord)
     {
         return toAjax(kaoqinRecordService.updateKaoqinRecord(kaoqinRecord));

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

@@ -65,22 +65,22 @@ public class KaoqinRecord extends BaseEntity
     private String kaSort;
 
     /** 打卡时间 -上午上班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -上午上班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimeAmIn;
 
     /** 打卡时间 -上午下班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -上午下班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimeAmOut;
 
     /** 打卡时间 -下午上班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -下午上班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimePmIn;
 
     /** 打卡时间 -下午下班 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "HH:mm:ss")
     @Excel(name = "打卡时间 -下午下班", width = 30, dateFormat = "yyyy-MM-dd")
     private Date kaTimePmOut;