246

notes-attendance/src/main/java/com/zjty/tynotes/attendance/dao/WorkoverApproDao.java

@@ -13,7 +13,9 @@ import java.util.List;
  */
 @Repository
 public interface WorkoverApproDao extends MongoRepository<WorkoverAppro,String> {
-    WorkoverAppro findByUserIdContainsAndStatusAndOverDate(String userId, String status, Date date);
+    WorkoverAppro findByUserIdAndStatusAndOverDate(String userId, String status, Date date);
+
+    List<WorkoverAppro> findAllByGroupMenbersContainsAndStatusAndOverDate(String userId, String status, Date date);
 
     List<WorkoverAppro> findAllByUserId(String userId);
 

notes-attendance/src/main/java/com/zjty/tynotes/attendance/task/CardTask.java

@@ -203,8 +203,9 @@ public class CardTask {
                                 });
                             }
 
-                            WorkoverAppro workoverAppro = workoverApproDao.findByUserIdContainsAndStatusAndOverDate(user.getId(), "1", parse);
-//                            ApprovalInformation approvalInformation1 = approvalInformationDao.findByUserIdAndStatusAndApprovalType(user.getId(), "1", "加班");
+                            WorkoverAppro workoverAppro = workoverApproDao.findByUserIdAndStatusAndOverDate(user.getId(), "1", parse);
+                            List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByGroupMenbersContainsAndStatusAndOverDate(user.getId(), "1", parse);
+                            //                            ApprovalInformation approvalInformation1 = approvalInformationDao.findByUserIdAndStatusAndApprovalType(user.getId(), "1", "加班");
                             attendanceDetails.setUserId(user.getId());
                             if(cardResults1!=null){
                                 List<CardResult> cardResults = new ArrayList<>();
@@ -216,7 +217,7 @@ public class CardTask {
                                 });
                                 if(cardResults.size()>=2){
                                     attendanceDetails.setLessCard(0);
-                                    if(workoverAppro!=null){
+                                    if(workoverAppro!=null || workoverAppros!=null){
                                         cardResults.forEach(cardResult -> {
                                             if(cardResult.getCheckType()!=null && cardResult.getCheckType().equals("OffDuty")){
                                                 Long l = cardResult.getUserCheckTime().getTime() - date1.getTime();
@@ -335,10 +336,11 @@ public class CardTask {
                                         cardResults.add(cardResult);
                                     }
                                 });
-                                WorkoverAppro workoverAppro = workoverApproDao.findByUserIdContainsAndStatusAndOverDate(user.getId(), "1", parse);
+                                WorkoverAppro workoverAppro = workoverApproDao.findByUserIdAndStatusAndOverDate(user.getId(), "1", parse);
+                                List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByGroupMenbersContainsAndStatusAndOverDate(user.getId(), "1", parse);
 //                                ApprovalInformation approvalInformation1 = approvalInformationDao.findByUserIdAndStatusAndApprovalType(user.getId(), "1", "加班");
                                 if(cardResults.size()>=2){
-                                    if(workoverAppro!=null){
+                                    if(workoverAppro!=null || workoverAppros!=null){
                                         cardResults.forEach(cardResult -> {
                                             if(cardResult.getCheckType()!=null && cardResult.getCheckType().equals("OffDuty")){
                                                 Long l = cardResult.getUserCheckTime().getTime() - date1.getTime();