Browse Source

2024-12-04 功能优化

master
fengyuan_yang 2 years ago
parent
commit
ad0af1ff4e
  1. 49
      src/main/java/com/jianteng/modules/pms/service/impl/EamServiceImpl.java
  2. 37
      src/main/java/com/jianteng/modules/pms/util/HolidayUtils.java

49
src/main/java/com/jianteng/modules/pms/service/impl/EamServiceImpl.java

@ -1169,7 +1169,6 @@ public class EamServiceImpl implements EamService {
throw new RuntimeException("该计划状态不是已计划,请刷新数据!");
}
// 开始保存
if (planData.getPlanPeriod() == 0) { // 点检频率为0
// 获得工单号
if (inData.getFunctionType().equals("A")) {
@ -1243,17 +1242,15 @@ public class EamServiceImpl implements EamService {
}
planData.setOrderDate(orderDate);
// 是否选择了工单生成规则
if (planData.getWorkOrderRule() != null || !"".equals(planData.getWorkOrderRule())){
// 用户选择了周日也创建工单,就不进行工作日判断,跳过本次循环
if (planData.getWorkOrderRule().contains("A")) {
compareTo = orderDate.compareTo(endDate);
continue;
}
// 用户选择了周六周日也创建工单,就不进行工作日判断,跳过本次循环
if ("C".equals(planData.getWorkOrderRule())) {
compareTo = orderDate.compareTo(endDate);
continue;
}
// 判断是否为工作日
try {
// 循环直到找到下一个工作日
while (!HolidayUtils.isWorkingDay(orderDate.getTime())) {
while (!HolidayUtils.isWorkingDay(orderDate.getTime(), planData.getWorkOrderRule())) {
// 如果是休息日,则将日期加1
calendar.clear();
calendar.setTime(orderDate);
@ -1306,8 +1303,8 @@ public class EamServiceImpl implements EamService {
calendar.setTime(orderDate);
if (calendar.get(Calendar.DAY_OF_MONTH) != 31) {
calendar.set(Calendar.DATE, 31);
try { // 判断该月31日是不是周六周日,如果为周末就取30日
if (!HolidayUtils.isWorkingDay(calendar.getTime().getTime())){
try { // 判断该月31日是不是周六周日,如果为周六周末就取30日
if (!HolidayUtils.isWorkingDay(calendar.getTime().getTime(), planData.getWorkOrderRule())){
calendar.add(Calendar.DATE,-1);
}
orderDate = calendar.getTime();
@ -1320,17 +1317,15 @@ public class EamServiceImpl implements EamService {
}
planData.setOrderDate(orderDate);
// 是否选择了工单生成规则
if (planData.getWorkOrderRule()!= null || !"".equals(planData.getWorkOrderRule())) {
// 用户选择了周日也创建工单,就不进行工作日判断,跳过本次循环
if (planData.getWorkOrderRule().contains("A")) {
compareTo = orderDate.compareTo(endDate);
continue;
}
// 用户选择了周六周日也创建工单,就不进行工作日判断,跳过本次循环
if ("C".equals(planData.getWorkOrderRule())) {
compareTo = orderDate.compareTo(endDate);
continue;
}
// 判断是否为工作日
try {
// 循环直到找到下一个工作日
while (!HolidayUtils.isWorkingDay(orderDate.getTime())) {
while (!HolidayUtils.isWorkingDay(orderDate.getTime(), planData.getWorkOrderRule())) {
// 如果是休息日,则将日期加1
calendar.clear();
calendar.setTime(orderDate);
@ -1388,25 +1383,15 @@ public class EamServiceImpl implements EamService {
orderDate = calendar.getTime();
planData.setOrderDate(orderDate);
// 是否选择了工单生成规则
if (planData.getWorkOrderRule()!= null && !"".equals(planData.getWorkOrderRule())) {
// 用户选择了周日也创建工单,就不进行工作日判断,跳过本次循环
if (planData.getWorkOrderRule().contains("A")) {
compareTo = orderDate.compareTo(endDate);
continue;
}
// 用户选择了周六周日也创建工单,就不进行工作日判断,跳过本次循环
if ("C".equals(planData.getWorkOrderRule())) {
compareTo = orderDate.compareTo(endDate);
continue;
}
// 判断是否为工作日
try {
// Boolean workingDay = HolidayUtils.isWorkingDay(orderDate.getTime());
// if (!workingDay) { // 如果是节假日,日期改为下一天
// calendar.clear();
// calendar.setTime(orderDate);
// calendar.add(Calendar.DATE,1);
// orderDate = calendar.getTime();
// planData.setOrderDate(orderDate);
// }
// 循环直到找到下一个工作日
while (!HolidayUtils.isWorkingDay(orderDate.getTime())) {
while (!HolidayUtils.isWorkingDay(orderDate.getTime(), planData.getWorkOrderRule())) {
// 如果是休息日,则将日期加1
calendar.clear();
calendar.setTime(orderDate);

37
src/main/java/com/jianteng/modules/pms/util/HolidayUtils.java

@ -79,10 +79,12 @@ public class HolidayUtils {
* @return true: 工作日, false: 节假日
* @throws IOException
*/
public static Boolean isWorkingDay(Long time) throws IOException {
public static Boolean isWorkingDay(Long time, String workFlag) throws IOException {
// workFlag A表示周六工作, B表示周日工作, C表示周六周日都工作
LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.of("+8"));
String formatTime = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
initHolidayAndExtraWorkDay();
// String formatTime = dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
// initHolidayAndExtraWorkDay();
// //是否加班日
// if (extraWorkDay.contains(formatTime)) {
// return true;
@ -93,17 +95,22 @@ public class HolidayUtils {
// }
// 如果是1-5表示周一到周五 是工作日
DayOfWeek week = dateTime.getDayOfWeek();
if (week == DayOfWeek.SATURDAY || week == DayOfWeek.SUNDAY) {
return false;
if (workFlag.isEmpty()) {
// 周六周日不工作
if (week == DayOfWeek.SATURDAY || week == DayOfWeek.SUNDAY) {
return false;
}
} else {
if ("A".equals(workFlag)) {
if (week == DayOfWeek.SUNDAY) {
return false;
}
} else if ("B".equals(workFlag)) {
if (week == DayOfWeek.SATURDAY) {
return false;
}
}
}
// DayOfWeek week = dateTime.getDayOfWeek();
// //20240331 阮琦增加 健腾他们是双休 需要加上周六
// if (week == DayOfWeek.SATURDAY) {
// return false;
// }
// if (week == DayOfWeek.SUNDAY) {
// return false;
// }
return true;
}
@ -116,7 +123,7 @@ public class HolidayUtils {
* @throws IOException
*/
public static Boolean isOffDay(long time) throws IOException {
return !isWorkingDay(time);
return !isWorkingDay(time, "");
}
/**
@ -180,7 +187,7 @@ public class HolidayUtils {
//long currentTimeStamp = LocalDateTime.now().toInstant(ZoneOffset.ofHours(8)).toEpochMilli();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date = sdf.parse("2023-09-29");
Boolean workingDay = isWorkingDay(date.getTime());
Boolean workingDay = isWorkingDay(date.getTime(), "");
if (workingDay) {
System.out.println("工作日,加油,打工人");

Loading…
Cancel
Save