1.修复历史修正班次时不同角色的日期范围问题

王通
1 parent 955698c0
Showing 3 changed files with 25 additions and 16 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/SystemParam.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -627,16 +627,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping("dateArray")
 	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
 		List<String> rs = new ArrayList<>();
-		Set<Role> roles = SecurityUtils.getCurrentUser().getRoles();
-		SystemParam param = BasicData.getSystemParam().get(Constants.SPECIAL_ROLES);
-		int days = 4;
-		if (param != null && param.getValue() != null) {
-			for (Role role : roles) {
-				if (param.getValue().contains(String.format(",%s,", role.getCodeName()))) {
-					days = 5;
-				}
-			}
-		}
+		int days = SystemParam.getHistorySaveDays();
 		long t = System.currentTimeMillis();
 		if (c != 1) {
 package com.bsth.entity;
+import com.bsth.common.Constants;
+import com.bsth.data.BasicData;
+import com.bsth.entity.sys.Role;
+import com.bsth.security.util.SecurityUtils;
+
 import javax.persistence.*;
+import java.util.Set;
 /**
  * @author Hill
@@ -59,4 +65,19 @@ public class SystemParam {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public static int getHistorySaveDays() {
+        Set<Role> roles = SecurityUtils.getCurrentUser().getRoles();
+        SystemParam param = BasicData.getSystemParam().get(Constants.SPECIAL_ROLES);
+        int days = 4;
+        if (param != null && param.getValue() != null) {
+            for (Role role : roles) {
+                if (param.getValue().contains(String.format(",%s,", role.getCodeName()))) {
+                    days = 5;
+                }
+            }
+        }
+
+        return days;
+    }
 }
@@ -29,6 +29,7 @@ import java.util.Set;
 import java.util.concurrent.*;
 import java.util.regex.Pattern;
+import com.bsth.entity.*;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -67,10 +68,6 @@ import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
 import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.data.utils.CustomStringUtils;
-import com.bsth.entity.CarDevice;
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.Personnel;
 import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.calc.CalcStatistics;
 import com.bsth.entity.oil.Dlb;
@@ -626,7 +623,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
             long today = formatter.parseMillis(new DateTime().toString("yyyy-MM-dd")), scheduleDate = formatter.parseMillis(t.getScheduleDateStr());
             String clZbh = t.getClZbh(), lpName = t.getLpName();
-            if (today < scheduleDate || today - scheduleDate > 259200000) {
+            if (today < scheduleDate || today - scheduleDate > 86400000 * SystemParam.getHistorySaveDays()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "无效的调度日期");
                 return rs;
@@ -4679,7 +4676,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         // 检查调度日期
         DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
         long today = formatter.parseMillis(new DateTime().toString("yyyy-MM-dd")), scheduleDate = formatter.parseMillis(oldSch.getScheduleDateStr());
-        if (today < scheduleDate || today - scheduleDate > 259200000) {
+        if (today < scheduleDate || today - scheduleDate > 86400000 * SystemParam.getHistorySaveDays()) {
             rs.put("status", ResponseCode.ERROR);
             rs.put("msg", "无效的调度日期");
             return rs;