Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!380

src/main/java/cn/timer/api/bean/kqmk/KqglAssoDkjl.java

@@ -6,6 +6,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Table;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 
@@ -101,5 +102,10 @@ public class KqglAssoDkjl extends Model<KqglAssoDkjl> {
 	
 	
 	@ApiModelProperty(value="解释 ",example="解释")
 	@ApiModelProperty(value="解释 ",example="解释")
     private String commentary;
     private String commentary;
+	
+	
+	
+	@TableField(exist = false)
+	private Integer calendar_status_type;//0:无；1：事假；2：调休；3：病假；4：年假；5：产假；6：陪产假；7：婚假；8：例假；9：丧假；10：哺乳假；11：加班；12：出差；13：外出
 
 
 }
 }
\ No newline at end of file

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

@@ -2466,53 +2466,6 @@ public class ClockInController {
 							 }
 							 }
 						 }
 						 }
 						 
 						 
-						 
-						 /***********/
-						 
-						//事务(请假，加班，调休，出差)
- 		    			KqglAssoRelationSummary asssum = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
-		    						.eq(KqglAssoRelationSummary::getAppTime, str).last("LIMIT 1"));
-		    				if(asssum != null) {
-		    					
-		    					//0:无；1：事假；2：调休；3：病假；4：年假；5：产假；6：陪产假；7：婚假；8：例假；9：丧假；10：哺乳假；11：加班；12：出差；13：外出
-		    					if(asssum.getApprovalType() == 1) {
-		    						ash.setCalendar_status_type(11);
-		    					}else if(asssum.getApprovalType() == 2) {
-		    						//请假
-		    						KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,asssum.getLeaveTypeId()));
-		    						if(rul.getRulesType() == 1) {
-		    							ash.setCalendar_status_type(1);
-		    						}else if(rul.getRulesType() == 2) {
-		    							ash.setCalendar_status_type(2);
-		    						}else if(rul.getRulesType() == 3) {
-		    							ash.setCalendar_status_type(3);
-		    						}else if(rul.getRulesType() == 4) {
-		    							ash.setCalendar_status_type(4);
-		    						}else if(rul.getRulesType() == 5) {
-		    							ash.setCalendar_status_type(5);
-		    						}else if(rul.getRulesType() == 6) {
-		    							ash.setCalendar_status_type(6);
-		    						}else if(rul.getRulesType() == 7) {
-		    							ash.setCalendar_status_type(7);
-		    						}else if(rul.getRulesType() == 8) {
-		    							ash.setCalendar_status_type(8);
-		    						}else if(rul.getRulesType() == 9) {
-		    							ash.setCalendar_status_type(9);
-		    						}else if(rul.getRulesType() == 10) {
-		    							ash.setCalendar_status_type(10);
-		    						}
-		    					}else if(asssum.getApprovalType() == 3) {
-		    						ash.setCalendar_status_type(12);
-		    					}else if(asssum.getApprovalType() == 4) {
-		    						ash.setCalendar_status_type(13);
-		    					}
-		    				}else {
-		    					ash.setCalendar_status_type(0);
-		    				}
-						 
-						 /************/
-						 
-						 
 						 KqglAssoBcsz shif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ash.getId()));
 						 KqglAssoBcsz shif = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, ash.getId()));
 						 if(shif.getIsXbdk() == 1 && (ash.getSort())%2 == 0) { 
 						 if(shif.getIsXbdk() == 1 && (ash.getSort())%2 == 0) { 
 							 
 							 
@@ -2527,6 +2480,80 @@ public class ClockInController {
 								 dkjl.setStatus(1);
 								 dkjl.setStatus(1);
 							 }
 							 }
 						 }
 						 }
+						 
+						 
+						 
+						 /****/
+							//事务(请假，加班，调休，出差)
+	 		    			KqglAssoRelationSummary asssum1 = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
+			    						.eq(KqglAssoRelationSummary::getAppTime, str).last("LIMIT 1"));
+			    				if(asssum1 != null) {
+			    					
+			    					//0:无；1：事假；2：调休；3：病假；4：年假；5：产假；6：陪产假；7：婚假；8：例假；9：丧假；10：哺乳假；11：加班；12：出差；13：外出
+			    					if(asssum1.getApprovalType() == 1) {
+			    						dkjl.setCalendar_status_type(11);
+			    						
+			    						ash.setCalendar_status_type(11);
+			    					}else if(asssum1.getApprovalType() == 2) {
+			    						//请假
+			    						KqglAssoLeaveRules rul = KqglAssoLeaveRules.builder().build().selectOne(new QueryWrapper<KqglAssoLeaveRules>().lambda().eq(KqglAssoLeaveRules::getId,asssum1.getLeaveTypeId()));
+			    						if(rul.getRulesType() == 1) {
+			    							dkjl.setCalendar_status_type(1);
+			    							
+			    							ash.setCalendar_status_type(1);
+			    						}else if(rul.getRulesType() == 2) {
+			    							dkjl.setCalendar_status_type(2);
+			    							
+			    							ash.setCalendar_status_type(2);
+			    						}else if(rul.getRulesType() == 3) {
+			    							dkjl.setCalendar_status_type(3);
+			    							
+			    							ash.setCalendar_status_type(3);
+			    						}else if(rul.getRulesType() == 4) {
+			    							dkjl.setCalendar_status_type(4);
+			    							
+			    							ash.setCalendar_status_type(4);
+			    						}else if(rul.getRulesType() == 5) {
+			    							dkjl.setCalendar_status_type(5);
+			    							
+			    							ash.setCalendar_status_type(5);
+			    						}else if(rul.getRulesType() == 6) {
+			    							dkjl.setCalendar_status_type(6);
+			    							
+			    							ash.setCalendar_status_type(6);
+			    						}else if(rul.getRulesType() == 7) {
+			    							dkjl.setCalendar_status_type(7);
+			    							
+			    							ash.setCalendar_status_type(7);
+			    						}else if(rul.getRulesType() == 8) {
+			    							dkjl.setCalendar_status_type(8);
+			    							
+			    							ash.setCalendar_status_type(8);
+			    						}else if(rul.getRulesType() == 9) {
+			    							dkjl.setCalendar_status_type(9);
+			    							
+			    							ash.setCalendar_status_type(9);
+			    						}else if(rul.getRulesType() == 10) {
+			    							dkjl.setCalendar_status_type(10);
+			    							
+			    							ash.setCalendar_status_type(10);
+			    						}
+			    					}else if(asssum1.getApprovalType() == 3) {
+			    						dkjl.setCalendar_status_type(12);
+			    						
+			    						ash.setCalendar_status_type(12);
+			    					}else if(asssum1.getApprovalType() == 4) {
+			    						dkjl.setCalendar_status_type(13);
+			    						
+			    						ash.setCalendar_status_type(13);
+			    					}
+			    				}else {
+			    					dkjl.setCalendar_status_type(0);
+			    					
+			    					ash.setCalendar_status_type(0);
+			    				}
+							 /****/
+						 
 						 ash.setDajl(dkjl);
 						 ash.setDajl(dkjl);
 					 }
 					 }