格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/controller/VacationController.java

@@ -117,13 +117,6 @@ public class VacationController extends JeecgController<Vacation, IVacationServi
 	public Result<?> add(@RequestBody Vacation vacation) {
 		vacation.setState("2");
 		vacation.setUserDate(new Date());
-		if (oConvertUtils.isNotEmpty(vacation.getStartDate())&&oConvertUtils.isNotEmpty(vacation.getEndDate())){
-			double v = Double.parseDouble(String.valueOf(vacation.getStartDate().getTime()));
-			double vs = Double.parseDouble(String.valueOf(vacation.getEndDate().getTime()));
-			double ms=vs-v;
-			double day=ms/1000/(60 * 60);
-			vacation.setHolidayCount(String.valueOf(day));
-		}
 		vacationService.save(vacation);
 		return Result.OK("添加成功！");
 	}

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/vacation/entity/Vacation.java

@@ -63,14 +63,14 @@ public class Vacation {
     @ApiModelProperty(value = "请假时长")
 	private java.lang.String holidayCount;
 	/**开始时间*/
-	@Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "开始时间")
 	private java.util.Date startDate;
 	/**结束时间*/
-	@Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "结束时间")
 	private java.util.Date endDate;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java

@@ -120,6 +120,7 @@ public class SysUserDepartServiceImpl extends ServiceImpl<SysUserDepartMapper, S
 			}
 			LambdaQueryWrapper<SysUser> queryUser = new LambdaQueryWrapper<SysUser>();
 			queryUser.in(SysUser::getId,userIdList);
+			queryUser.eq(SysUser::getEmploymentStatus,10);
 			if(oConvertUtils.isNotEmpty(workNo)){
 				queryUser.like(SysUser::getWorkNo,workNo.trim());
 			}if(oConvertUtils.isNotEmpty(realname)){