Commit 0292f8cb43259f521687df9650ed111a9586a959
1 parent
fc4e5174
油电修改权限改成最高权限可修改5天，其他角色修改3天。隐藏开关页面
Showing
2 changed files
with
20 additions
and
4 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
| @@ -12,6 +12,7 @@ import java.util.HashMap; | @@ -12,6 +12,7 @@ import java.util.HashMap; | ||
| 12 | import java.util.Iterator; | 12 | import java.util.Iterator; |
| 13 | import java.util.List; | 13 | import java.util.List; |
| 14 | import java.util.Map; | 14 | import java.util.Map; |
| 15 | +import java.util.Set; | ||
| 15 | 16 | ||
| 16 | import javax.transaction.Transactional; | 17 | import javax.transaction.Transactional; |
| 17 | 18 | ||
| @@ -28,10 +29,12 @@ import org.springframework.stereotype.Service; | @@ -28,10 +29,12 @@ import org.springframework.stereotype.Service; | ||
| 28 | 29 | ||
| 29 | import com.alibaba.fastjson.JSONArray; | 30 | import com.alibaba.fastjson.JSONArray; |
| 30 | import com.alibaba.fastjson.JSONObject; | 31 | import com.alibaba.fastjson.JSONObject; |
| 32 | +import com.bsth.common.Constants; | ||
| 31 | import com.bsth.common.ResponseCode; | 33 | import com.bsth.common.ResponseCode; |
| 32 | import com.bsth.data.BasicData; | 34 | import com.bsth.data.BasicData; |
| 33 | import com.bsth.entity.Cars; | 35 | import com.bsth.entity.Cars; |
| 34 | import com.bsth.entity.Line; | 36 | import com.bsth.entity.Line; |
| 37 | +import com.bsth.entity.SystemParam; | ||
| 35 | import com.bsth.entity.mcy_forms.Daily; | 38 | import com.bsth.entity.mcy_forms.Daily; |
| 36 | import com.bsth.entity.oil.Cyl; | 39 | import com.bsth.entity.oil.Cyl; |
| 37 | import com.bsth.entity.oil.Dlb; | 40 | import com.bsth.entity.oil.Dlb; |
| @@ -39,6 +42,7 @@ import com.bsth.entity.oil.Nylog; | @@ -39,6 +42,7 @@ import com.bsth.entity.oil.Nylog; | ||
| 39 | import com.bsth.entity.oil.Ylb; | 42 | import com.bsth.entity.oil.Ylb; |
| 40 | import com.bsth.entity.oil.Ylxxb; | 43 | import com.bsth.entity.oil.Ylxxb; |
| 41 | import com.bsth.entity.search.CustomerSpecs; | 44 | import com.bsth.entity.search.CustomerSpecs; |
| 45 | +import com.bsth.entity.sys.Role; | ||
| 42 | import com.bsth.entity.sys.SysUser; | 46 | import com.bsth.entity.sys.SysUser; |
| 43 | import com.bsth.repository.CarsRepository; | 47 | import com.bsth.repository.CarsRepository; |
| 44 | import com.bsth.repository.LineRepository; | 48 | import com.bsth.repository.LineRepository; |
| @@ -1601,6 +1605,18 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -1601,6 +1605,18 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 1601 | public String checkDate(Map<String, Object> map) { | 1605 | public String checkDate(Map<String, Object> map) { |
| 1602 | // TODO Auto-generated method stub | 1606 | // TODO Auto-generated method stub |
| 1603 | SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); | 1607 | SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); |
| 1608 | + | ||
| 1609 | + Set<Role> roles = SecurityUtils.getCurrentUser().getRoles(); | ||
| 1610 | + SystemParam param = BasicData.getSystemParam().get(Constants.SPECIAL_ROLES); | ||
| 1611 | + int days = 4; | ||
| 1612 | + if (param != null && param.getValue() != null) { | ||
| 1613 | + for (Role role : roles) { | ||
| 1614 | + if (param.getValue().contains(String.format(",%s,", role.getCodeName()))) { | ||
| 1615 | + days = 5; | ||
| 1616 | + } | ||
| 1617 | + } | ||
| 1618 | + } | ||
| 1619 | + | ||
| 1604 | String rq=map.get("rq").toString(); | 1620 | String rq=map.get("rq").toString(); |
| 1605 | String gsbm=map.get("ssgsdm_like").toString(); | 1621 | String gsbm=map.get("ssgsdm_like").toString(); |
| 1606 | String type="1"; | 1622 | String type="1"; |
| @@ -1609,8 +1625,8 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -1609,8 +1625,8 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 1609 | try { | 1625 | try { |
| 1610 | long day2=date.getTime(); | 1626 | long day2=date.getTime(); |
| 1611 | long day1=sdf.parse(rq).getTime(); | 1627 | long day1=sdf.parse(rq).getTime(); |
| 1612 | - long days = (day2 - day1) / (24*3600*1000); | ||
| 1613 | - if(days>3){ | 1628 | + long d = (day2 - day1) / (24*3600*1000); |
| 1629 | + if(d >= days){ | ||
| 1614 | type="2"; | 1630 | type="2"; |
| 1615 | } | 1631 | } |
| 1616 | } catch (ParseException e) { | 1632 | } catch (ParseException e) { |
| @@ -1623,8 +1639,8 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -1623,8 +1639,8 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 1623 | try { | 1639 | try { |
| 1624 | long day2=date.getTime(); | 1640 | long day2=date.getTime(); |
| 1625 | long day1=sdf.parse(rq).getTime(); | 1641 | long day1=sdf.parse(rq).getTime(); |
| 1626 | - long days = (day2 - day1) / (24*3600*1000); | ||
| 1627 | - if(days>3){ | 1642 | + long d = (day2 - day1) / (24*3600*1000); |
| 1643 | + if(d > days){ | ||
| 1628 | type="2"; | 1644 | type="2"; |
| 1629 | } | 1645 | } |
| 1630 | } catch (ParseException e) { | 1646 | } catch (ParseException e) { |
src/main/resources/static/pages/oil/modifyRightsPj.html renamed to src/main/resources/static/pages/oil/modifyRights_pj.html