1

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

@@ -65,15 +65,15 @@ public class ClockInfoController {
         return clockInfoService.suppClock(clockInfo);
     }
 
-    /**
-     * 补卡信息审核
-     *
-     * @param clockInfo
-     * @return
-     */
-    @PostMapping("/api/examineClock")
-    public String examineClock(@RequestBody ClockInfo clockInfo) {
-        return clockInfoService.examineClock(clockInfo);
-    }
+//    /**
+//     * 补卡信息审核
+//     *
+//     * @param clockInfo
+//     * @return
+//     */
+//    @PostMapping("/api/examineClock")
+//    public String examineClock(@RequestBody ClockInfo clockInfo) {
+//        return clockInfoService.examineClock(clockInfo);
+//    }
 }
 

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

@@ -44,10 +44,10 @@ public interface IClockInfoService extends IService<ClockInfo> {
      */
     String suppClock(ClockInfo clockInfo);
 
-    /**
-     * 补卡信息审核
-     *
-     * @param clockInfo
-     */
-    String examineClock(ClockInfo clockInfo);
+//    /**
+//     * 补卡信息审核
+//     *
+//     * @param clockInfo
+//     */
+//    String examineClock(ClockInfo clockInfo);
 }

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

@@ -200,32 +200,32 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
         return "OK";
     }
 
-    /**
-     * 补卡信息审核
-     *
-     * @param clockInfo
-     * @return
-     */
-    @Override
-    public String examineClock(ClockInfo clockInfo) {
-        //查询打卡信息
-        ClockInfo clockInfo1 = this.selectById(clockInfo.getId());
-        if (clockInfo1 != null && "1".equals(clockInfo1.getStatusFlag())) {
-            //通过
-            if (clockInfo.getExamineFlag() == 1) {
-                //补卡状态改为补卡成功
-                clockInfo1.setStatus(StatusEnum.SUPP_SUCCESS.getName());
-                clockInfo1.setStatusFlag(StatusEnum.SUPP_SUCCESS.getFlag());
-            }
-            //驳回
-            else {
-                //补卡状态改为补卡失败
-                clockInfo1.setStatus(StatusEnum.SUPP_FAIL.getName());
-                clockInfo1.setStatusFlag(StatusEnum.SUPP_FAIL.getFlag());
-            }
-            //更新数据
-            this.updateById(clockInfo1);
-        }
-        return null;
-    }
+//    /**
+//     * 补卡信息审核
+//     *
+//     * @param clockInfo
+//     * @return
+//     */
+//    @Override
+//    public String examineClock(ClockInfo clockInfo) {
+//        //查询打卡信息
+//        ClockInfo clockInfo1 = this.selectById(clockInfo.getId());
+//        if (clockInfo1 != null && "1".equals(clockInfo1.getStatusFlag())) {
+//            //通过
+//            if (clockInfo.getExamineFlag() == 1) {
+//                //补卡状态改为补卡成功
+//                clockInfo1.setStatus(StatusEnum.SUPP_SUCCESS.getName());
+//                clockInfo1.setStatusFlag(StatusEnum.SUPP_SUCCESS.getFlag());
+//            }
+//            //驳回
+//            else {
+//                //补卡状态改为补卡失败
+//                clockInfo1.setStatus(StatusEnum.SUPP_FAIL.getName());
+//                clockInfo1.setStatusFlag(StatusEnum.SUPP_FAIL.getFlag());
+//            }
+//            //更新数据
+//            this.updateById(clockInfo1);
+//        }
+//        return null;
+//    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ClockInfoMapper.xml

@@ -10,7 +10,7 @@
         comp_id = #{compId}
         and common_id = #{commonId}
         and delete_flag = '0'
-        and leave_id == null
+--         and leave_id == null
     </select>
     <!-- 打卡记录查询 -->
     <select id="getListByCondition" parameterType="Map"
@@ -38,7 +38,7 @@
         comp_id = #{compId}
         and common_id = #{commonId}
         and delete_flag = '0'
-        and leave_id == null
+--         and leave_id == ''
         ORDER BY create_date
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}