潘钊 / bsth_control · Commits

Commit de2c4e801c2205862e25865c1ffada97eac1f334

Authored by yiming
2 parents e109fb98 225796f1
build: skipped

Merge remote-tracking branch 'origin/pudong_jdk8' into pudong_jdk8

Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @de2c4e8
... ... @@ -629,7 +629,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
629 629 List<String> rs = new ArrayList<>();
630 630 Set<Role> roles = SecurityUtils.getCurrentUser().getRoles();
631 631 SystemParam param = BasicData.getSystemParam().get(Constants.SPECIAL_ROLES);
632   - int days = 3;
  632 + int days = 4;
633 633 if (param != null && param.getValue() != null) {
634 634 for (Role role : roles) {
635 635 if (param.getValue().contains(String.format(",%s,", role.getCodeName()))) {
... ...
src/main/java/com/bsth/service/impl/InoutCarparkServiceImpl.java
  View file @de2c4e8
... ... @@ -446,8 +446,8 @@ public class InoutCarparkServiceImpl extends BaseServiceImpl&lt;LsInoutSectionRoute
446 446 map.put("destroy", 0);
447 447 map.put("directions", 3);
448 448 map.put("descriptions", "");
449   - map.put("start", scheduleRealInfo.getQdzCode());
450   - map.put("end", scheduleRealInfo.getZdzCode());
  449 + map.put("start", scheduleRealInfo.getQdzName());
  450 + map.put("end", scheduleRealInfo.getZdzName());
451 451 map.put("bsectionVector", new ObjectMapper().writeValueAsString(bsectionVector));
452 452  
453 453 lsInoutSectionRouteRepository.destroy(scheduleRealInfo.getXlBm(), versions, scheduleRealInfo.getQdzName(), scheduleRealInfo.getZdzName());
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @de2c4e8
... ... @@ -626,7 +626,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
626 626 DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
627 627 long today = formatter.parseMillis(new DateTime().toString("yyyy-MM-dd")), scheduleDate = formatter.parseMillis(t.getScheduleDateStr());
628 628 String clZbh = t.getClZbh(), lpName = t.getLpName();
629   - if (today < scheduleDate || today - scheduleDate > 172800000) {
  629 + if (today < scheduleDate || today - scheduleDate > 259200000) {
630 630 rs.put("status", ResponseCode.ERROR);
631 631 rs.put("msg", "无效的调度日期");
632 632 return rs;
... ... @@ -4679,7 +4679,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4679 4679 // 检查调度日期
4680 4680 DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
4681 4681 long today = formatter.parseMillis(new DateTime().toString("yyyy-MM-dd")), scheduleDate = formatter.parseMillis(sch.getScheduleDateStr());
4682   - if (today < scheduleDate || today - scheduleDate > 172800000) {
  4682 + if (today < scheduleDate || today - scheduleDate > 259200000) {
4683 4683 rs.put("status", ResponseCode.ERROR);
4684 4684 rs.put("msg", "无效的调度日期");
4685 4685 return rs;
... ...