提交

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

@@ -67,14 +67,13 @@ import cn.timer.api.dto.kqmk.AttLateLate;
 import cn.timer.api.dto.kqmk.AttSchedule;
 import cn.timer.api.dto.kqmk.AttendanceCardListDto;
 import cn.timer.api.dto.kqmk.ClockCollectData;
-import cn.timer.api.dto.kqmk.KqglAssoMonthPunchSummaryDto;
 import cn.timer.api.dto.kqmk.KqglAssoPbmxDto;
+import cn.timer.api.dto.kqmk.TransactionApprovalDto;
 import cn.timer.api.dto.kqmk.WorkbenchCalendarDto;
 import cn.timer.api.utils.DateUtil;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.ResultUtil;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 
 @Api(tags = "3.0[3]考勤打卡")
@@ -3013,11 +3012,8 @@ public class ClockInController {
 			    					if(asssum1.getApprovalType() != 5) {
 			 		    				String startTime = asssum1.getStartTime();//
 			 		    				String endTime = asssum1.getEndTime();//
-			 		    				
 			 		    				if(ash.getDajl().getCardType() != null) {
-			 		    					
 			 		    					boolean affair = ClockInTool.hourMinuteBetween(ClockInTool.stampToDate(String.valueOf(ash.getDajl().getDktime())), startTime, endTime,"yyyy-MM-dd HH:mm:ss");
-			 		    					
 			 		    					if(affair && ash.getDajl().getStatus() != 9 && ash.getDajl().getStatus() != 10 && ash.getDajl().getStatus() != 11
 			 		    							&& ash.getDajl().getStatus() != 12 && ash.getDajl().getStatus() != 13 && ash.getDajl().getStatus() != 14) {
 			 		    						ash.getDajl().setStatus(1);
@@ -3366,6 +3362,58 @@ public class ClockInController {
 				 }
 			 }
 			 
+			 List<TransactionApprovalDto> tranappr = new ArrayList<TransactionApprovalDto>();
+			 //事务审批单
+			 List<KqglAssoRelationSummary> trap = KqglAssoRelationSummary.builder().build().selectList(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
+						.eq(KqglAssoRelationSummary::getAppTime, str));
+			 if(trap.size() > 0) {
+				 for(KqglAssoRelationSummary spnsw : trap) {
+					 TransactionApprovalDto taap = TransactionApprovalDto.builder().build();
+					 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);
+					 }
+				 }
+			 }else {
+				 attdate.setTranappr(tranappr);
+			 }
+			 
+			 
 			   //外勤   true:开   false:关
 			    if(attgro.getIsWq() == 1) {
 			    	attdate.setFieldpersonnel(true);

src/main/java/cn/timer/api/dto/kqmk/AttendanceCardListDto.java

@@ -44,4 +44,6 @@ public class AttendanceCardListDto implements Serializable {
 
 //	private List<SystemShift> ssfh;// 无排班时获取的系统班次
 	private Integer attgrouptype;// 1：固定排班；2：自由排班；3：自由工时
+	
+	private List<TransactionApprovalDto> tranappr;//事务审批单
 }

src/main/java/cn/timer/api/dto/kqmk/TransactionApprovalDto.java

+package cn.timer.api.dto.kqmk;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Yl123
+ *	事务审批单
+ */
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TransactionApprovalDto {
+	
+	private Integer calendar_status_type;//0:无；1：事假；2：调休；3：病假；4：年假；5：产假；6：陪产假；7：婚假；8：例假；9：丧假；10：哺乳假；11：加班；12：出差；13：外出
+	
+	private Integer approval_form;//审批单
+	
+}