Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!385

src/main/java/cn/timer/api/controller/spmk/service/SpmkServiceImpl.java

@@ -113,6 +113,7 @@ public class SpmkServiceImpl implements SpmkService{
 		if(sum != null) {
 		if(sum != null) {
 			adD.setEmpNum(sum.getEmpNum());
 			adD.setEmpNum(sum.getEmpNum());
 			adD.setSts(sum.getSts());
 			adD.setSts(sum.getSts());
+			adD.setLaunchTime(sum.getCreateTime());
 			SpmkExecutor exe= null;
 			SpmkExecutor exe= null;
 			
 			
 			SpmkApproveExecuteRecord exere = SpmkApproveExecuteRecord.builder().build()
 			SpmkApproveExecuteRecord exere = SpmkApproveExecuteRecord.builder().build()

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

@@ -21,7 +21,7 @@ public class AttSchedule implements Serializable{
 	
 	
 	private Integer id;
 	private Integer id;
 	private Integer sort;// 1:上班；2：下班； 3：上班；4:下班；5:上班；6:下班
 	private Integer sort;// 1:上班；2：下班； 3：上班；4:下班；5:上班；6:下班
-	private Integer nextday;//0:否；1:是
+	private Integer nextday;//0:否；1:是   （0：今日；1：次日；2：昨日）
 	private Long time;
 	private Long time;
 	private Long starttime;
 	private Long starttime;
 	private Long endtime;
 	private Long endtime;
@@ -32,4 +32,6 @@ public class AttSchedule implements Serializable{
 	private int isupdate;//是否跟新打卡
 	private int isupdate;//是否跟新打卡
 	private int isdk;//0:当前打卡  1：已过打卡
 	private int isdk;//0:当前打卡  1：已过打卡
 	private KqglAssoDkjl dajl;
 	private KqglAssoDkjl dajl;
+	
+	private int nextdaycard;
 }
 }

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

@@ -60,4 +60,7 @@ public class ClockCollectData implements Serializable {
 
 
 	@ApiModelProperty(value = "打卡类型", example = "1：打卡 2：更新打卡")
 	@ApiModelProperty(value = "打卡类型", example = "1：打卡 2：更新打卡")
 	private Integer differ;
 	private Integer differ;
+	
+	@ApiModelProperty(value = "打卡", example = "0：当天卡 1：次日卡")
+	private Integer nextday;
 }
 }

src/main/java/cn/timer/api/dto/spmk/SpmkApproveDetailDto.java

 package cn.timer.api.dto.spmk;
 package cn.timer.api.dto.spmk;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
@@ -54,5 +55,7 @@ public class SpmkApproveDetailDto {
 	private Integer exeid;
 	private Integer exeid;
 	
 	
 	private Integer exereid;
 	private Integer exereid;
+	
+	private Date launchTime; //审批发起时间
 
 
 }
 }