Merge remote-tracking branch 'origin/dev' into dev

“mitao”

2026-01-30 bb4f3de1d2b1ca33238e79ed31bb26504ab4b5b0

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java

@@ -255,21 +255,24 @@
                }
                Date s1 = sdf.parse("2020-11-11 " + startTime + ":00");
                Date e1 = sdf.parse("2020-11-11 " + endTime + ":00");
                if(s1.getTime() >= e1.getTime()){
                    return ResultUtil.error("【" + startTime + " - " + endTime + "】时间段无效，添加失败！");
                }
                boolean b = false;
                for(TLineShift lineShift : tLineShifts){
                    Date s2 = sdf.parse("2020-11-11 " + lineShift.getStartTime() + ":00");
                    Date e2 = sdf.parse("2020-11-11 " + lineShift.getEndTime() + ":00");
                    if(s2.getTime() <= s1.getTime() && e1.getTime() <= e2.getTime()){
                    if(s2.getTime() < s1.getTime() && e1.getTime() < e2.getTime()){
                        list.add(startTime + " - " + endTime);
                        b = true;
                        break;
                    }
                    if(s1.getTime() <= s2.getTime() && s1.getTime() <= e2.getTime() && e1.getTime() >= s2.getTime()){
                    if(s1.getTime() < s2.getTime() && s1.getTime() < e2.getTime() && e1.getTime() > s2.getTime()){
                        list.add(startTime + " - " + endTime);
                        b = true;
                        break;
                    }
                    if(s1.getTime() >= s2.getTime() && s1.getTime() <= e2.getTime() && e1.getTime() >= e2.getTime()){
                    if(s1.getTime() > s2.getTime() && s1.getTime() < e2.getTime() && e1.getTime() > e2.getTime()){
                        list.add(startTime + " - " + endTime);
                        b = true;
                        break;