Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/controller/SmartAttendanceController.java

@@ -208,8 +208,16 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
                     }
                 }
             }
+            ArrayList<SmartAttendance> attendanceArrayList = new ArrayList<>();
+            for (SmartAttendance attendance : attendances) {
+//                判断是否有重复数据
+                List<SmartAttendance> smartAttendances = smartAttendanceService.duplicatesList(attendance.getStartTime(), attendance.getEndTime(), attendance.getInitiateTime());
+                if (ObjectUtils.isEmpty(smartAttendances) && smartAttendances.size() <= 0) {
+                    attendanceArrayList.add(attendance);
+                }
+            }
 
-            boolean insertResult = smartAttendanceService.insertAttendanceBatch(attendances);
+            boolean insertResult = smartAttendanceService.insertAttendanceBatch(attendanceArrayList);
             if (!insertResult) {
                 return CommonResult.fail("请假数据获取失败");
             }
@@ -362,7 +370,7 @@ public class SmartAttendanceController implements SmartAttendanceControllerAPI {
     }
 
     @Override
-    @DESRespondSecret(validated = false)
+    @DESRespondSecret(validated = true)
     public CommonResult queryPage(int currentPage, int pageCount, Integer gradeId, Integer classId, Integer status, String studentNo, String name, String startTime, String endTime) {
         PageUtils<SmartAttendanceVo> result= smartAttendanceService.queryPage(currentPage,pageCount,gradeId,classId,status,studentNo,name,startTime,endTime);
         return CommonResult.ok(result);

src/main/java/com/template/services/SmartAttendanceService.java

@@ -36,4 +36,6 @@ public interface SmartAttendanceService extends IService<SmartAttendance> {
     PageUtils<AskForLeaveVo> askForLeavePage(int currentPage, int pageCount,String name, String cardNo, String startTime, String endTime,Integer ifVerification,String classId);
 
     PageUtils<SmartAttendanceVo> queryPage(int currentPage, int pageCount, Integer gradeId, Integer classId, Integer status, String studentNo, String name, String startTime, String endTime);
+
+    List<SmartAttendance> duplicatesList(Date startTime, Date endTime, Date initiateTime);
 }

src/main/java/com/template/services/impl/SmartAttendanceServiceImpl.java

@@ -114,4 +114,15 @@ public class SmartAttendanceServiceImpl extends ServiceImpl<SmartAttendanceMappe
         IPage<SmartAttendanceVo> datas = smartAttendanceMapper.queryPage(page,gradeId,classId,status,studentNo,name,startTime,endTime);
         return new PageUtils(datas);
     }
+
+    @Override
+    public List<SmartAttendance> duplicatesList(Date startTime, Date endTime, Date initiateTime) {
+        LambdaQueryWrapper<SmartAttendance> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(SmartAttendance::getStartTime,startTime)
+                .eq(SmartAttendance::getEndTime,endTime)
+                .eq(SmartAttendance::getInitiateTime,initiateTime);
+        List<SmartAttendance> list = this.list(wrapper);
+
+        return list;
+    }
 }

src/main/resources/mapper/template/SmartAttendanceMapper.xml

@@ -14,7 +14,7 @@
     <select id="askForLeavePage" resultType="com.template.model.vo.AskForLeaveVo">
         SELECT
             sa.id,
-            su.head_image,
+            su.head_image as image,
             sa.xw_user_name,
             su.card_no,
             sa.start_time,