|
@@ -491,10 +491,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
queryWrapper.eq("bill_status", 0);
|
|
|
}
|
|
|
if ("2".equals(type)) {
|
|
|
- queryWrapper.in("bill_status", 1,2);
|
|
|
+ queryWrapper.in("bill_status", 1, 2);
|
|
|
}
|
|
|
if ("3".equals(type)) {
|
|
|
- queryWrapper.eq("bill_status", 3);
|
|
|
+ queryWrapper.eq("bill_status", 3);
|
|
|
}
|
|
|
return new Result(ResultCode.SUCCESS, isolateMapper.selectPage(page, queryWrapper));
|
|
|
}
|
|
@@ -561,7 +561,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
baseProcess.setCurrentStatus(substring + "1," + 0);
|
|
|
|
|
|
processMapper.updateById(baseProcess);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
baseProcess.setUpdateDate(baseProcess.getUpdateDate() + "," + sdf.format(new Date()));
|
|
|
baseProcess.setCurrentLocation(baseProcess.getCurrentLocation());
|
|
|
baseProcess.setCurrentLocationId(baseProcess.getCurrentLocationId());
|
|
@@ -576,7 +576,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
|
|
|
}
|
|
|
};
|
|
|
// 设定延迟时间(两小时后执行,单位为秒)
|
|
|
- long delay = 60 * 60 * 24 * dayNum;
|
|
|
+ long delay = (startDate.getTime() - endDate.getTime()) / 1000;
|
|
|
// 执行定时任务
|
|
|
scheduler.schedule(task, delay, TimeUnit.SECONDS);
|
|
|
return new Result(10000, "提交成功!", true);
|