新增考勤打卡,打卡配置

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

@@ -95,7 +95,8 @@ public class KaoQinController extends BaseController {
              String dictLabel = sysDictDatum.getDictLabel();
              //获取异常的值
             String dictValue = sysDictDatum.getDictValue();
-            Long aLong = collect.get(dictValue);
+            Long aLong = 0L;
+            aLong =  collect.get(dictValue);
             map.put(dictLabel,aLong);
         }
         map.put("count",kaoqinRecords.size());
@@ -104,14 +105,11 @@ public class KaoQinController extends BaseController {
 
 
     /**
-     * 查询考勤异常数据信息
-     * 包括所有异常的数量
-     * 本月考勤记录的异常分类数量
+     *考勤日历
      */
     @GetMapping("/calendar")
     public AjaxResult calendar(KaoqinRecord kaoqinRecord) {
         //根据打卡人id和月份去找对应的打卡记录
-
         List<KaoqinRecord> kaoqinRecords = kaoqinRecordService.selectKaoqinRecordList(kaoqinRecord);
         Map<String, List<KaoqinRecord>> collect = kaoqinRecords.stream().collect(Collectors.groupingBy(KaoqinRecord::getKaTime));
         List list = new ArrayList();
@@ -130,6 +128,8 @@ public class KaoQinController extends BaseController {
             }
             if (num==0){
                 abnormal = "1";
+            }else {
+                abnormal = abnormal.substring(0,abnormal.length() -1);
             }
             //日期
             map.put("data",date);

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

@@ -36,7 +36,6 @@ public class KaoqinConfigController extends BaseController
     /**
      * 查询考勤规则配置列表
      */
-    @PreAuthorize("@ss.hasPermi('kaoqin:config:list')")
     @GetMapping("/list")
     public TableDataInfo list(KaoqinConfig kaoqinConfig)
     {
@@ -61,7 +60,6 @@ public class KaoqinConfigController extends BaseController
     /**
      * 获取考勤规则配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('kaoqin:config:query')")
     @GetMapping(value = "/{kaoqinId}")
     public AjaxResult getInfo(@PathVariable("kaoqinId") Long kaoqinId)
     {
@@ -71,18 +69,16 @@ public class KaoqinConfigController extends BaseController
     /**
      * 新增考勤规则配置
      */
-    @PreAuthorize("@ss.hasPermi('kaoqin:config:add')")
     @Log(title = "考勤规则配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody KaoqinConfig kaoqinConfig)
     {
-        return toAjax(kaoqinConfigService.insertKaoqinConfig(kaoqinConfig));
+        return toAjaxKaoQin(kaoqinConfigService.insertKaoqinConfig(kaoqinConfig));
     }
 
     /**
      * 修改考勤规则配置
      */
-    @PreAuthorize("@ss.hasPermi('kaoqin:config:edit')")
     @Log(title = "考勤规则配置", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
     public AjaxResult edit(@RequestBody KaoqinConfig kaoqinConfig)
@@ -93,7 +89,6 @@ public class KaoqinConfigController extends BaseController
     /**
      * 删除考勤规则配置
      */
-    @PreAuthorize("@ss.hasPermi('kaoqin:config:remove')")
     @Log(title = "考勤规则配置", businessType = BusinessType.DELETE)
     @GetMapping(value = "/delete/{kaoqinIds}")
     public AjaxResult remove(@PathVariable Long[] kaoqinIds)

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

@@ -37,7 +37,6 @@ public class KaoqinRecordController extends BaseController
     /**
      * 查询考勤记录列表
      */
-    @PreAuthorize("@ss.hasPermi('system:record:list')")
     @GetMapping("/list")
     public TableDataInfo list(KaoqinRecord kaoqinRecord)
     {
@@ -72,7 +71,6 @@ public class KaoqinRecordController extends BaseController
     /**
      * 新增考勤记录
      */
-    @PreAuthorize("@ss.hasPermi('system:record:add')")
     @Log(title = "考勤记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody KaoqinRecord kaoqinRecord)
@@ -83,7 +81,6 @@ public class KaoqinRecordController extends BaseController
     /**
      * 修改考勤记录
      */
-    @PreAuthorize("@ss.hasPermi('system:record:edit')")
     @Log(title = "考勤记录", businessType = BusinessType.UPDATE)
     @PostMapping("put")
     public AjaxResult edit(@RequestBody KaoqinRecord kaoqinRecord)

ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -149,6 +149,17 @@ public class BaseController
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
+    /**
+     * 响应返回结果
+     *
+     * @param rows 影响行数
+     * @return 操作结果
+     */
+    protected AjaxResult toAjaxKaoQin(int rows)
+    {
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+
     /**
      * 响应返回结果
      * 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -134,6 +134,16 @@ public class AjaxResult extends HashMap<String, Object>
         return AjaxResult.error("操作失败");
     }
 
+    /**
+     * 返回错误消息
+     *
+     * @return 错误消息
+     */
+    public static AjaxResult errorKaoQin()
+    {
+        return AjaxResult.error("当前已有考勤规则,请勿重复添加");
+    }
+
     /**
      * 返回错误消息
      * 

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

@@ -56,6 +56,13 @@ public class KaoqinConfigServiceImpl implements IKaoqinConfigService
     @Override
     public int insertKaoqinConfig(KaoqinConfig kaoqinConfig)
     {
+        String deptId = kaoqinConfig.getDeptId();
+        KaoqinConfig kc = new KaoqinConfig();
+        kc.setDeptId(deptId);
+        List<KaoqinConfig> kaoqinConfigs = kaoqinConfigMapper.selectKaoqinConfigList(kc);
+        if (kaoqinConfigs != null && kaoqinConfigs.size() > 0){
+            return 0;
+        }
         kaoqinConfig.setCreateTime(DateUtils.getNowDate());
         return kaoqinConfigMapper.insertKaoqinConfig(kaoqinConfig);
     }