|
|
@@ -88,9 +88,11 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
|
|
|
//周日-周1为上周
|
|
|
int dtoCount=this.checkWeek(startDto,endDto);
|
|
|
if(startDto.compareTo(endDto)>=0){
|
|
|
+ log.info("开始时间不能大于结束时间");
|
|
|
return CommonResult.fail("开始时间不能大于结束时间");
|
|
|
}
|
|
|
if(dtoCount==-1||dtoCount>countConfig){
|
|
|
+ log.info("申请日期不能跨周,一周不能超过"+countConfig+"天,请重新申请");
|
|
|
return CommonResult.fail("申请日期不能跨周,一周不能超过"+countConfig+"天,请重新申请");
|
|
|
}
|
|
|
//筛选同一周数据
|
|
|
@@ -105,11 +107,13 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
|
|
|
for (ApplicationProcedureTemporary apt : list) {
|
|
|
if (apt.getEndTime().substring(0,10).equals(endDto.substring(0,10))
|
|
|
|| apt.getStartTime().substring(0,10).equals(startDto.substring(0,10))) {
|
|
|
+ log.info("相同日期已有待审批申请,请勿重复申请");
|
|
|
return CommonResult.fail("相同日期已有待审批申请,请勿重复申请");
|
|
|
}
|
|
|
aa=this.checkWeek(apt.getStartTime(),apt.getEndTime())+aa;
|
|
|
//已申请+本次大于配置数量则不能申请
|
|
|
if(countConfig<aa+dtoCount){
|
|
|
+ log.info("总申请天数超过本周限额");
|
|
|
return CommonResult.fail("总申请天数超过本周限额");
|
|
|
}
|
|
|
|
|
|
@@ -119,6 +123,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
|
|
|
boolean b = TimeExchange.CompareDate(endDto, apt.getStartTime(), "yyyy-MM-dd");
|
|
|
b= apt.getStartTime().substring(0, 10).equals(endDto.substring(0,10)) || b;
|
|
|
if (!(a || b)) {
|
|
|
+ log.info("日期范围内已有待审批申请");
|
|
|
return CommonResult.fail("日期范围内已有待审批申请");
|
|
|
}
|
|
|
} catch (ParseException e) {
|
|
|
@@ -130,12 +135,14 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
|
|
|
Users users=usersService.getById(usersId);
|
|
|
String orgId=users.getOrganId();
|
|
|
if(ObjectUtils.isEmpty(organizationService.getById(orgId))){
|
|
|
+ log.info("身份异常,申请提交失败");
|
|
|
return CommonResult.fail("身份异常,申请提交失败");
|
|
|
}
|
|
|
ArrayList<String> strings = new ArrayList<>();
|
|
|
strings=this.getCardNumbers(strings,admins,orgId);
|
|
|
|
|
|
if(strings.isEmpty()){
|
|
|
+ log.info("您暂无审批人,请联系管理员添加");
|
|
|
return CommonResult.fail("您暂无审批人,请联系管理员添加");
|
|
|
}
|
|
|
ApplicationProcedureTemporary applicationProcedure = new ApplicationProcedureTemporary();
|