浦交信息部要求，油电量编辑限制同步路单编辑限制，可编辑范围设置为今天昨天前天。

娄高锋
1 parent 9c583641
Showing 4 changed files with 111 additions and 3 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/oil/modifyRightsPj.html
@@ -254,6 +254,22 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 		return resMap;
 	}
  
+	@RequestMapping(value = "/getModifyRightsPj",method = RequestMethod.GET)
+	public Map<String, Object> getModifyRightsPj(@RequestParam Map<String, Object> map){
+		String result=ylbService.getModifyRightsPj();
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("text", result);
+		return resMap;
+	}
+	
+	@RequestMapping(value = "/modifyRightsChangePj",method = RequestMethod.GET)
+	public Map<String, Object> modifyRightsChangePj(@RequestParam Map<String, Object> map){
+		String result=ylbService.modifyRightsChangePj();
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		resMap.put("text", result);
+		return resMap;
+	}
+	
 	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
 	public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
 		Map<String, Object> list=ylbService.sumYlb(map);
@@ -23,6 +23,8 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
  
 	String getModifyRights();
 	String modifyRightsChange();
+	String getModifyRightsPj();
+	String modifyRightsChangePj();
  
 	List<Map<String, Object>> oilListMonth(Map<String, Object> map);
 	List<Ylb> listYlb(Map<String, Object> map);
@@ -92,7 +92,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
  
 	Logger logger = LoggerFactory.getLogger(this.getClass());
  
-	private static boolean modify_rights_close = true;
+	private static boolean modify_rights_close = false;		//南汇的油电修改权限（由于浦交加了限制，改为默认打开权限）
+	
+	private static boolean modify_rights_close_pj = true;
  
 	/**
 	 * 获取进存油信息
@@ -1602,7 +1604,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		String rq=map.get("rq").toString();
 		String gsbm=map.get("ssgsdm_like").toString();
 		String type="1";
-		if(gsbm.equals("26") && modify_rights_close){
+		if(gsbm.equals("26") && modify_rights_close){	//南汇公司的修改权限
 			Date date=new Date();
 			try {
 				long day2=date.getTime();
@@ -1616,12 +1618,26 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				e.printStackTrace();
 			}
 		}
+		if(modify_rights_close_pj){	//浦交规定的修改权限，今天昨天前天三天可修改
+			Date date=new Date();
+			try {
+				long day2=date.getTime();
+				long day1=sdf.parse(rq).getTime();
+				long days = (day2 - day1) / (24*3600*1000);  
+			    if(days>=3){
+			    	type="2";
+			    }
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
 		return type;
 	}
  
 	@Override
 	public String getModifyRights(){
-		return modify_rights_close?"关闭":"打开";
+		return modify_rights_close?"关闭":"打开";	//打开是可编辑，关闭是不可编辑
 	}
  
 	@Override
@@ -1634,6 +1650,21 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		return modify_rights_close?"权限关闭":"权限打开";
 	}
  
+	@Override
+	public String getModifyRightsPj(){
+		return modify_rights_close_pj?"关闭":"打开";
+	}
+	
+	@Override
+	public String modifyRightsChangePj(){
+		if(modify_rights_close_pj){
+			modify_rights_close_pj = false;
+		} else {
+			modify_rights_close_pj = true;
+		}
+		return modify_rights_close_pj?"权限关闭":"权限打开";
+	}
+	
  
  
 	@Override
+<div class="page-head">
+	<div class="page-title">
+		<h1>进出站油电信息编辑权限</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><span class="active">编辑权限</span></li>
+</ul>
+
+<div class="portlet light bordered">
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> <span
+				class="caption-subject font-red-sunglo bold uppercase"></span>
+		</div>
+	</div>
+	<div class="portlet-body form">
+		<form action="/addYlb" class="form-horizontal" id="ylb_add_form" >
+		
+		<div class="alert alert-danger display-hide">
+			<button class="close" data-close="alert"></button>
+			您的输入有误，请检查下面的输入项
+		</div>
+			<input type="hidden" value="0" name="yhlx" />
+			<div class="form-body">
+				<div class="form-group">
+					<label class="col-md-3 control-label">修改历史油/电权限：</label>
+					<div class="col-md-2">
+						<input type="text" class="form-control" name="modify_rights_pj" id="modify_rights_pj" readonly="readonly">
+					</div>
+					<button type="button" class="btn green" id="changePj" >修改</button>
+				</div>
+			</div>
+		</form>
+		<!-- END FORM-->
+	</div>
+</div>
+<script>
+(function(){
+	
+	function getModifyRightsPj(){
+		$get('/ylb/getModifyRightsPj',"",function(result){
+			$("#modify_rights_pj").val(result.text);
+		});
+	}
+	getModifyRightsPj();
+	
+	$("#changePj").on('click', function () {
+		var par={};
+		par["modify_rights_pj"] = $("#modify_rights_pj").val();
+		$get('/ylb/modifyRightsChangePj',par,function(result){
+			layer.msg(result.text);
+			getModifyRightsPj();
+		});
+	});
+	
+})();
+</script>
 \ No newline at end of file