修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ClockInfoController.java

@@ -2,7 +2,6 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.AcquisitionInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.ClockInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IClockInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,14 +22,16 @@ public class ClockInfoController {
     private IClockInfoService clockInfoService;
 
     /**
-     * 添加h上班打卡信息
+     * 添加上班打卡信息
+     *
      * @param clockInfo
      * @return
      */
     @PostMapping("/api/addClock")
-    public String addClock(@RequestBody ClockInfo clockInfo){
+    public String addClock(@RequestBody ClockInfo clockInfo) {
         return clockInfoService.addClock(clockInfo);
     }
+
     /**
      * 打卡记录查询
      *
@@ -41,6 +42,7 @@ public class ClockInfoController {
     public Page<ClockInfo> selectClockInfo(ClockInfo clockInfo) {
         return clockInfoService.selectClockInfo(clockInfo);
     }
+
     /**
      * 考勤记录查询(PC)
      *
@@ -51,22 +53,26 @@ public class ClockInfoController {
     public Page<ClockInfo> selectClockInfoPc(ClockInfo clockInfo) {
         return clockInfoService.selectClockInfoPc(clockInfo);
     }
+
     /**
      * 添加补卡信息
+     *
      * @param clockInfo
      * @return
      */
     @PostMapping("/api/suppClock")
-    public String suppClock(@RequestBody ClockInfo clockInfo){
+    public String suppClock(@RequestBody ClockInfo clockInfo) {
         return clockInfoService.suppClock(clockInfo);
     }
+
     /**
      * 补卡信息审核
+     *
      * @param clockInfo
      * @return
      */
     @PostMapping("/api/examineClock")
-    public String examineClock(@RequestBody ClockInfo clockInfo){
+    public String examineClock(@RequestBody ClockInfo clockInfo) {
         return clockInfoService.examineClock(clockInfo);
     }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ClockInfo.java

@@ -131,13 +131,6 @@ public class ClockInfo extends BaseModel<ClockInfo> {
      */
     @TableField(exist = false)
     private List<ClockInfo> clockInfoList;
-    /**
-     * 打卡日期
-     */
-    @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date theClockDate;
     /**
      * 通过1驳回2
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/ClockInfoMapper.java

@@ -30,6 +30,7 @@ public interface ClockInfoMapper extends BaseMapper<ClockInfo> {
      * @return
      */
     List<ClockInfo> getListByCondition(Map<String, Object> pageView);
+
     /**
      * 根据条件查询总数(PC)
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IClockInfoService.java

@@ -16,9 +16,11 @@ public interface IClockInfoService extends IService<ClockInfo> {
 
     /**
      * 添加上班打卡信息
-     * @param  clockInfo
+     *
+     * @param clockInfo
      */
     String addClock(ClockInfo clockInfo);
+
     /**
      * 打卡记录
      *
@@ -26,6 +28,7 @@ public interface IClockInfoService extends IService<ClockInfo> {
      * @return
      */
     Page<ClockInfo> selectClockInfo(ClockInfo clockInfo);
+
     /**
      * 考勤记录
      *
@@ -33,14 +36,18 @@ public interface IClockInfoService extends IService<ClockInfo> {
      * @return
      */
     Page<ClockInfo> selectClockInfoPc(ClockInfo clockInfo);
+
     /**
      * 添加补卡信息
-     * @param  clockInfo
+     *
+     * @param clockInfo
      */
     String suppClock(ClockInfo clockInfo);
+
     /**
      * 补卡信息审核
-     * @param  clockInfo
+     *
+     * @param clockInfo
      */
     String examineClock(ClockInfo clockInfo);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ClockInfoServiceImpl.java

@@ -28,6 +28,7 @@ import java.util.*;
 public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo> implements IClockInfoService {
     @Autowired
     private IClockInfoService clockInfoService;
+
     /**
      * 添加打卡信息
      *
@@ -131,6 +132,7 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
 
     /**
      * 考勤记录(PC)
+     *
      * @param clockInfo
      * @return
      */
@@ -152,10 +154,10 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
         if (!CollectionUtils.isEmpty(dataList)) {
             for (ClockInfo clockInfo1 : dataList) {
                 List<ClockInfo> clockInfoList = clockInfoService.selectList(new EntityWrapper<ClockInfo>()
-                                .eq("comp_id",clockInfo1.getCompId())
-                                .eq("common_id",clockInfo1.getCommonId())
-                                .eq("delete_flag","0"));
-                if(CollectionUtils.isNotEmpty(clockInfoList)){
+                        .eq("comp_id", clockInfo1.getCompId())
+                        .eq("common_id", clockInfo1.getCommonId())
+                        .eq("delete_flag", "0"));
+                if (CollectionUtils.isNotEmpty(clockInfoList)) {
                     clockInfo1.setClockInfoList(clockInfoList);
                 }
             }