提交

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

@@ -3369,45 +3369,42 @@ public class ClockInController {
 			 if(trap.size() > 0) {
 				 for(KqglAssoRelationSummary spnsw : trap) {
 					 TransactionApprovalDto taap = TransactionApprovalDto.builder().build();
-					 if(spnsw.getApprovalType() == 2) {
+					 
+					 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() == 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);
-								
-							}
-						 	taap.setApproval_form(spnsw.getApprovalId());
-						 
-						 	tranappr.add(taap);	
-						 attdate.setTranappr(tranappr);
-					 }
+					 	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 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);

src/main/resources/mapping/kqmk/KqglAssoRelationSummaryMapper.xml

@@ -76,7 +76,7 @@
 		and res.org_code = #{orgcode}
 		and res.approval_type = #{approvaltype}
 		and res.app_time = #{apptime}
-		GROUP BY res.start_time,res.end_time;
+		GROUP BY res.start_time,res.end_time DESC LIMIT 1
     </select>
     
     <select id="selectTabledata" resultMap="BaseResultMap">