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

王通
1 parent cbdc12e2
Showing 5 changed files with 37 additions and 29 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/SystemParam.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/PrivilegeUtils.java
@@ -20,6 +20,7 @@ import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.util.HttpClientUtils;
+import com.bsth.util.PrivilegeUtils;
 import com.bsth.util.ReportUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.util.db.DBUtils_control;
@@ -627,7 +628,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping("dateArray")
 	public List<String> dateArray(@RequestParam(defaultValue = "0") int c){
 		List<String> rs = new ArrayList<>();
-		int days = SystemParam.getHistorySaveDays();
+		int days = PrivilegeUtils.getHistoryEditDays();
  
 		long t = System.currentTimeMillis();
 		if (c != 1) {
@@ -65,19 +65,4 @@ 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;
-    }
 }
@@ -16,6 +16,7 @@ import java.util.Set;
  
 import javax.transaction.Transactional;
  
+import com.bsth.util.PrivilegeUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -1606,7 +1607,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
  
-		int days = SystemParam.getHistorySaveDays();
+		int days = PrivilegeUtils.getHistoryEditDays();
  
 		String rq=map.get("rq").toString();
 		String gsbm=map.get("ssgsdm_like").toString();
@@ -30,6 +30,7 @@ import java.util.concurrent.*;
 import java.util.regex.Pattern;
  
 import com.bsth.entity.*;
+import com.bsth.util.*;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -115,16 +116,6 @@ import com.bsth.service.report.ReportService;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DictionaryService;
 import com.bsth.service.sys.DutyEmployeeService;
-import com.bsth.util.Arith;
-import com.bsth.util.ComparableChild;
-import com.bsth.util.ComparableLp;
-import com.bsth.util.ComparableReal;
-import com.bsth.util.ConfigUtil;
-import com.bsth.util.DateUtils;
-import com.bsth.util.ReportRelatedUtils;
-import com.bsth.util.ReportUtils;
-import com.bsth.util.TimeUtils;
-import com.bsth.util.TransGPS;
 import com.bsth.websocket.handler.SendUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.stuxuhai.jpinyin.PinyinException;
@@ -623,7 +614,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 > 86400000 * SystemParam.getHistorySaveDays()) {
+            if (today < scheduleDate || today - scheduleDate > 86400000 * PrivilegeUtils.getHistoryEditDays()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "无效的调度日期");
                 return rs;
@@ -4676,7 +4667,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 > 86400000 * SystemParam.getHistorySaveDays()) {
+        if (today < scheduleDate || today - scheduleDate > 86400000 * PrivilegeUtils.getHistoryEditDays()) {
             rs.put("status", ResponseCode.ERROR);
             rs.put("msg", "无效的调度日期");
             return rs;
+package com.bsth.util;
+
+import com.bsth.common.Constants;
+import com.bsth.data.BasicData;
+import com.bsth.entity.SystemParam;
+import com.bsth.entity.sys.Role;
+import com.bsth.security.util.SecurityUtils;
+
+import java.util.Set;
+
+/**
+ * @author Hill
+ */
+public class PrivilegeUtils {
+
+    public static int getHistoryEditDays() {
+        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;
+    }
+}