潘钊 / bsth_control · Commits

Commit 0292f8cb43259f521687df9650ed111a9586a959

Authored by 娄高锋
1 parent fc4e5174
build: skipped

油电修改权限改成最高权限可修改5天，其他角色修改3天。隐藏开关页面

Inline Side-by-side
Showing 2 changed files with 20 additions and 4 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @0292f8c
... ... @@ -12,6 +12,7 @@ import java.util.HashMap;
12 12 import java.util.Iterator;
13 13 import java.util.List;
14 14 import java.util.Map;
  15 +import java.util.Set;
15 16  
16 17 import javax.transaction.Transactional;
17 18  
... ... @@ -28,10 +29,12 @@ import org.springframework.stereotype.Service;
28 29  
29 30 import com.alibaba.fastjson.JSONArray;
30 31 import com.alibaba.fastjson.JSONObject;
  32 +import com.bsth.common.Constants;
31 33 import com.bsth.common.ResponseCode;
32 34 import com.bsth.data.BasicData;
33 35 import com.bsth.entity.Cars;
34 36 import com.bsth.entity.Line;
  37 +import com.bsth.entity.SystemParam;
35 38 import com.bsth.entity.mcy_forms.Daily;
36 39 import com.bsth.entity.oil.Cyl;
37 40 import com.bsth.entity.oil.Dlb;
... ... @@ -39,6 +42,7 @@ import com.bsth.entity.oil.Nylog;
39 42 import com.bsth.entity.oil.Ylb;
40 43 import com.bsth.entity.oil.Ylxxb;
41 44 import com.bsth.entity.search.CustomerSpecs;
  45 +import com.bsth.entity.sys.Role;
42 46 import com.bsth.entity.sys.SysUser;
43 47 import com.bsth.repository.CarsRepository;
44 48 import com.bsth.repository.LineRepository;
... ... @@ -1601,6 +1605,18 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS
1601 1605 public String checkDate(Map<String, Object> map) {
1602 1606 // TODO Auto-generated method stub
1603 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 1620 String rq=map.get("rq").toString();
1605 1621 String gsbm=map.get("ssgsdm_like").toString();
1606 1622 String type="1";
... ... @@ -1609,8 +1625,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1609 1625 try {
1610 1626 long day2=date.getTime();
1611 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 1630 type="2";
1615 1631 }
1616 1632 } catch (ParseException e) {
... ... @@ -1623,8 +1639,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1623 1639 try {
1624 1640 long day2=date.getTime();
1625 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 1644 type="2";
1629 1645 }
1630 1646 } catch (ParseException e) {
... ...
src/main/resources/static/pages/oil/modifyRightsPj.html renamed to src/main/resources/static/pages/oil/modifyRights_pj.html
  View file @0292f8c