Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!450

src/main/java/cn/timer/api/controller/kqgl/ClockInController.java

@@ -3355,48 +3355,50 @@ public class ClockInController {
 						.eq(KqglAssoRelationSummary::getAppTime, str));
 			 if(trap.size() > 0) {
 				 for(KqglAssoRelationSummary spnsw : trap) {
-					 TransactionApprovalDto taap = TransactionApprovalDto.builder().build();
-					 
-					 if(spnsw.getApprovalType() == 1) {
-						 taap.setCalendar_status_type(11);
- 					 }else if(spnsw.getApprovalType() == 2) {
-						 KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,spnsw.getLeaveTypeId()));
-					 	if(rul.getRulesType() != null) {
-							if(rul.getRulesType() == 1) {
-						 		taap.setCalendar_status_type(1);
-							}else if(rul.getRulesType() == 2) {
-								taap.setCalendar_status_type(2);
-							}else if(rul.getRulesType() == 3) {
-								taap.setCalendar_status_type(3);
-							}else if(rul.getRulesType() == 4) {
-								taap.setCalendar_status_type(4);
-							}else if(rul.getRulesType() == 5) {
-								taap.setCalendar_status_type(5);
-							}else if(rul.getRulesType() == 6) {
-								taap.setCalendar_status_type(6);
-							}else if(rul.getRulesType() == 7) {
-								taap.setCalendar_status_type(7);
-							}else if(rul.getRulesType() == 8) {
-								taap.setCalendar_status_type(8);
-							}else if(rul.getRulesType() == 9) {
-								taap.setCalendar_status_type(9);
-							}else if(rul.getRulesType() == 10) {
-								taap.setCalendar_status_type(10);
-							}
-					 	}else {
-					 		taap.setCalendar_status_type(-1);
-					 		taap.setCalendar_status_name(rul.getName());
-					 	}
-					}else if(spnsw.getApprovalType() == 3) {
-						taap.setCalendar_status_type(12);
- 					}else if(spnsw.getApprovalType() == 4) {
- 						taap.setCalendar_status_type(13);
- 					}
-					 
-					 taap.setApproval_form(spnsw.getApprovalId());
-					 tranappr.add(taap);	
-					 
-					 attdate.setTranappr(tranappr);
+					 if(spnsw.getApprovalType() != 5) {
+						 TransactionApprovalDto taap = TransactionApprovalDto.builder().build();
+						 
+						 if(spnsw.getApprovalType() == 1) {
+							 taap.setCalendar_status_type(11);
+	 					 }else if(spnsw.getApprovalType() == 2) {
+							 KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,spnsw.getLeaveTypeId()));
+						 	if(rul.getRulesType() != null) {
+								if(rul.getRulesType() == 1) {
+							 		taap.setCalendar_status_type(1);
+								}else if(rul.getRulesType() == 2) {
+									taap.setCalendar_status_type(2);
+								}else if(rul.getRulesType() == 3) {
+									taap.setCalendar_status_type(3);
+								}else if(rul.getRulesType() == 4) {
+									taap.setCalendar_status_type(4);
+								}else if(rul.getRulesType() == 5) {
+									taap.setCalendar_status_type(5);
+								}else if(rul.getRulesType() == 6) {
+									taap.setCalendar_status_type(6);
+								}else if(rul.getRulesType() == 7) {
+									taap.setCalendar_status_type(7);
+								}else if(rul.getRulesType() == 8) {
+									taap.setCalendar_status_type(8);
+								}else if(rul.getRulesType() == 9) {
+									taap.setCalendar_status_type(9);
+								}else if(rul.getRulesType() == 10) {
+									taap.setCalendar_status_type(10);
+								}
+						 	}else {
+						 		taap.setCalendar_status_type(-1);
+						 		taap.setCalendar_status_name(rul.getName());
+						 	}
+						}else if(spnsw.getApprovalType() == 3) {
+							taap.setCalendar_status_type(12);
+	 					}else if(spnsw.getApprovalType() == 4) {
+	 						taap.setCalendar_status_type(13);
+	 					}
+						 
+						 taap.setApproval_form(spnsw.getApprovalId());
+						 tranappr.add(taap);	
+						 
+						 attdate.setTranappr(tranappr);
+					 }
 				 }
 			 }else {
 				 attdate.setTranappr(tranappr);