Merge branch 'lal' into 'develop'

修复

See merge request 8timerv2/8timerapiv200!154

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

@@ -122,7 +122,7 @@ public class KqglAssoBcsz extends Model<KqglAssoBcsz> {
 	@ApiModelProperty(value = "上下班次数(1/2/3  最大值为3)", example = "101")
 	@ApiModelProperty(value = "上下班次数(1/2/3  最大值为3)", example = "101")
 	private Integer sxbcs;
 	private Integer sxbcs;
 
 
-	@ApiModelProperty(value = "是否允许下班打卡(0：否；1：是) 是否允许下班打卡(0：否；1：是)", example = "101")
+	@ApiModelProperty(value = "是否下班不用打卡(0：否；1：是)", example = "101")
 	private Integer isXbdk;
 	private Integer isXbdk;
 
 
 	@ApiModelProperty(value = "允许迟到分钟数 允许迟到分钟数", example = "101")
 	@ApiModelProperty(value = "允许迟到分钟数 允许迟到分钟数", example = "101")

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

@@ -167,9 +167,36 @@ public class TimeCardController {
 	@ApiOperation(value = "2：新增班次信息", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperation(value = "2：新增班次信息", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperationSupport(order = 2)
 	@ApiOperationSupport(order = 2)
 	public Result<KqglAssoBcsz> ShiftInformation(@CurrentUser UserBean userBean,@RequestBody KqglAssoBcsz shif) {
 	public Result<KqglAssoBcsz> ShiftInformation(@CurrentUser UserBean userBean,@RequestBody KqglAssoBcsz shif) {
+			String sdf = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 			shif.setQyid(userBean.getOrgCode());
 			shif.setQyid(userBean.getOrgCode());
 			shif.setLusjTime(new Date().getTime());
 			shif.setLusjTime(new Date().getTime());
 			shif.setLuryid(userBean.getEmpNum());//录入人员
 			shif.setLuryid(userBean.getEmpNum());//录入人员
+			
+			boolean xbbydk = false;
+			if(shif.getIsXbdk() == 1) {
+				xbbydk = true;
+			}
+			
+			if(shif.getSxbcs() == 1) {
+				if(xbbydk) {
+					shif.setXbdk1("");
+					String asd = ClockInTool.addtime(sdf+" "+shif.getSbdk1()+":00", "1").substring(11, 16);
+					shif.setXbdk1(asd);
+				}
+			}else if(shif.getSxbcs() == 2) {
+				if(xbbydk) {
+					shif.setXbdk2("");
+					String asd = ClockInTool.addtime(sdf+" "+shif.getSbdk2()+":00", "1").substring(11, 16);
+					shif.setXbdk2(asd);
+				}
+			}else {
+				if(xbbydk) {
+					shif.setXbdk3("");
+					String asd = ClockInTool.addtime(sdf+" "+shif.getSbdk3()+":00", "1").substring(11, 16);
+					shif.setXbdk3(asd);
+				}
+			}
+			
 			if(kqglassobcszmapper.insert(shif)>0){
 			if(kqglassobcszmapper.insert(shif)>0){
 				return ResultUtil.data(shif, "新增班次成功");
 				return ResultUtil.data(shif, "新增班次成功");
 			}else{
 			}else{