线调更新,修正历史路单维护的临加班次跨天起终点时间异常

lizhuojun
1 parent b03371b6
Showing 3 changed files with 283 additions and 281 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/permission/user/authorize.html
src/main/resources/static/pages/permission/user/main.html
@@ -590,6 +590,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
             //计算班次实际执行时间
             schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
+            //处理计达跨24点
+            LineConfig conf = lineConfigData.get(t.getXlBm());
+            if (t.getZdsj().compareTo(conf.getStartOpt()) < 0) {
+                t.setZdsjT(sdfyyyyMMddHHmm.parse(t.getScheduleDateStr() + t.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
+            }
             if (t.getZdsjT() < t.getFcsjT()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "起终点时间异常！");
-<!DOCTYPE html>
+<!--<!DOCTYPE html>-->
 <html lang="zh-cn">
  
 <head>
     <meta charset="UTF-8">
+    <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+    <script src="/assets/js/common.js"></script>
+    <script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+    <script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+    <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"></script>
+    <!-- EventProxy  -->
+    <script src="/assets/js/eventproxy.js"></script>
+    <!-- art-template 模版引擎 -->
+    <script src="/assets/plugins/template.js"></script>
+    <script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+    <script src="/assets/plugins/ztree_v3/js/jquery.ztree.core.min.js"></script>
+    <script src="/assets/plugins/ztree_v3/js/jquery.ztree.excheck.min.js"></script>
     <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
     <link rel="stylesheet" href="/assets/plugins/ztree_v3/css/zTreeStyle/zTreeStyle.css" />
     <style>
-        html,body{
-            height: 100%;
-        }
-        .ct_page{
-            padding: 25px 15px;
-            height: 100%;
-            height: calc(100% - 50px);
-        }
+    html,body{
+    height: 100%;
+    }
+    .ct_page{
+    padding: 25px 15px;
+    height: 100%;
+    height: calc(100% - 50px);
+    }
  
-        .ct_cont{
-            height: calc(100% - 41px);
-        }
+    .ct_cont{
+    height: calc(100% - 41px);
+    }
  
-        .ct_cont>div>div.uk-card{
-            height: 99%;
-        }
+    .ct_cont>div>div.uk-card{
+    height: 99%;
+    }
  
-        form .uk-inline{
-            width: calc(100% - 4px);
-            margin-left: 2px;
-        }
+    form .uk-inline{
+    width: calc(100% - 4px);
+    margin-left: 2px;
+    }
  
-        .ct-card-body{
-            overflow: auto;
-            padding: 1px 1px 0 2px;
-            height: calc(100% - 54px);
-            position: relative;
-            margin-top: -12px;
-        }
+    .ct-card-body{
+    overflow: auto;
+    padding: 1px 1px 0 2px;
+    height: calc(100% - 54px);
+    position: relative;
+    margin-top: -12px;
+    }
  
-        .ct_li_desc{
-            color: #a8a8a8;
-            font-size: 13px;
-        }
+    .ct_li_desc{
+    color: #a8a8a8;
+    font-size: 13px;
+    }
  
-        .ct-card-body .uk-list-large{
-            font-size: 14px;
-        }
+    .ct-card-body .uk-list-large{
+    font-size: 14px;
+    }
  
-        .ct-card-body .uk-list-large>li{
-            cursor: default;
-            padding-left: 20px;
-            margin-top: 2px !important;
-            padding-top: 17px !important;
-            position: relative;
-        }
+    .ct-card-body .uk-list-large>li{
+    cursor: default;
+    padding-left: 20px;
+    margin-top: 2px !important;
+    padding-top: 17px !important;
+    position: relative;
+    }
  
-        .ct-card-body .uk-list-large>li:hover{
-            background: #edecec;
-        }
+    .ct-card-body .uk-list-large>li:hover{
+    background: #edecec;
+    }
  
-        .ct-card-body .uk-list-large>li.active{
-            background: #1e87f0 !important;
-            color: white;
-        }
+    .ct-card-body .uk-list-large>li.active{
+    background: #1e87f0 !important;
+    color: white;
+    }
  
-        .ct-card-body .uk-list-large>li.active>span.role-code{
-            color: #ffffff;
-        }
+    .ct-card-body .uk-list-large>li.active>span.role-code{
+    color: #ffffff;
+    }
  
-        .ct-card-body .uk-list-large.role-list>li:hover{
-            background: #fff494;
-        }
+    .ct-card-body .uk-list-large.role-list>li:hover{
+    background: #fff494;
+    }
  
-        .ct-card-body .uk-list-large>li.active .ct_li_desc{
-            color: #e6e6e6;
-        }
+    .ct-card-body .uk-list-large>li.active .ct_li_desc{
+    color: #e6e6e6;
+    }
  
-        .ct-card-body .uk-list-large>li>span.uk-badge{
-            position: absolute;
-            top: 17px;
-            right: 25px;
-        }
+    .ct-card-body .uk-list-large>li>span.uk-badge{
+    position: absolute;
+    top: 17px;
+    right: 25px;
+    }
  
-        .ct-card-body .uk-list-large>li>span.role-code{
-            padding: 4px 6px;
-            color: #a8a8a8;
-            margin-left: 5px;
-        }
+    .ct-card-body .uk-list-large>li>span.role-code{
+    padding: 4px 6px;
+    color: #a8a8a8;
+    margin-left: 5px;
+    }
  
-        .top_title{
-            padding: 9px 0 5px 15px;
-            border-bottom: 1px solid #ededed;
-            border-left: 5px solid #FFC107;
-        }
+    .top_title{
+    padding: 9px 0 5px 15px;
+    border-bottom: 1px solid #ededed;
+    border-left: 5px solid #FFC107;
+    }
  
-        .top_title>.desc{
-            font-size: 13px;
-            color: grey;
-            margin-top: 3px;
-        }
+    .top_title>.desc{
+    font-size: 13px;
+    color: grey;
+    margin-top: 3px;
+    }
  
-        .left_menu_list{
-            overflow: auto;
-            position: relative;
-        }
+    .left_menu_list{
+    overflow: auto;
+    position: relative;
+    }
  
-        .left_menu_list .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
-            opacity: 0.6 !important;
-            padding: 0 !important;
-        }
+    .left_menu_list .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+    opacity: 0.6 !important;
+    padding: 0 !important;
+    }
  
-        ._company{
-            margin: 15px 0px;
-        }
-        ._company>h5{
-            margin-bottom: 10px;
-            font-size: 15px;
-            color: #6b6b6b;
-            text-indent: 12px;
-        }
-        ._company>._fgs>label{
-            padding: 3px 12px 3px 10px;
-            display: inline-block;
-            border: 1px solid gainsboro;
-            border-radius: 2px;
-            margin: 5px;
-            font-size: 14px;
-        }
-        ._company>._fgs>label.active{
-            background: #1e87f0;
-            color: #fff;
-        }
-        ._company .uk-checkbox:checked:focus,
-        .line_checkbox_list .uk-checkbox:checked:focus{
-            background-color: #1e87f0 !important;
-        }
-        .save_icon{
-            position: absolute;
-            right: 2px;
-            background: #bec4c9;
-            font-size: 12px;
-            padding: 2px 15px;
-            color: #fff;
-            box-shadow: 0 5px 15px rgba(0,0,0,0.08);
-            cursor: pointer;
-        }
-        .save_icon:hover{
-            background: #FFC107;
-        }
-        .data_auth_list{
-            position: relative;
-        }
-        #user_authorize_wrap .top_title{
-            border-left: 5px solid #cacac8;
-        }
-        .xd_line_list{
-            height: 37%;
-            padding: 7px;
-            border-bottom: 1px solid #f2f2f2;
-            overflow: auto;
-            position: relative;
-        }
-        .xd_line_list>h5{
-            color: #858585;
-            margin: 5px 5px 5px 0;
-            font-size: 14px;
-        }
-        .sub_lines{
-            padding-left: 15px;
-        }
-        .sub_lines>span.line_btn {
-            background: #00BCD4;
-            color: #fff;
-            padding: 4px 9px;
-            display: inline-block;
-            min-width: 68px;
-            text-align: center;
-            margin: 5px 2px;
-            box-shadow: 0 5px 9px rgba(0,0,0,0.08);
-            cursor: pointer;
-            font-size: 14px;
-            font-family: 微软雅黑;
-        }
+    ._company{
+    margin: 15px 0px;
+    }
+    ._company>h5{
+    margin-bottom: 10px;
+    font-size: 15px;
+    color: #6b6b6b;
+    text-indent: 12px;
+    }
+    ._company>._fgs>label{
+    padding: 3px 12px 3px 10px;
+    display: inline-block;
+    border: 1px solid gainsboro;
+    border-radius: 2px;
+    margin: 5px;
+    font-size: 14px;
+    }
+    ._company>._fgs>label.active{
+    background: #1e87f0;
+    color: #fff;
+    }
+    ._company .uk-checkbox:checked:focus,
+    .line_checkbox_list .uk-checkbox:checked:focus{
+    background-color: #1e87f0 !important;
+    }
+    .save_icon{
+    position: absolute;
+    right: 2px;
+    background: #bec4c9;
+    font-size: 12px;
+    padding: 2px 15px;
+    color: #fff;
+    box-shadow: 0 5px 15px rgba(0,0,0,0.08);
+    cursor: pointer;
+    }
+    .save_icon:hover{
+    background: #FFC107;
+    }
+    .data_auth_list{
+    position: relative;
+    }
+    #user_authorize_wrap .top_title{
+    border-left: 5px solid #cacac8;
+    }
+    .xd_line_list{
+    height: 37%;
+    padding: 7px;
+    border-bottom: 1px solid #f2f2f2;
+    overflow: auto;
+    position: relative;
+    }
+    .xd_line_list>h5{
+    color: #858585;
+    margin: 5px 5px 5px 0;
+    font-size: 14px;
+    }
+    .sub_lines{
+    padding-left: 15px;
+    }
+    .sub_lines>span.line_btn {
+    background: #00BCD4;
+    color: #fff;
+    padding: 4px 9px;
+    display: inline-block;
+    min-width: 68px;
+    text-align: center;
+    margin: 5px 2px;
+    box-shadow: 0 5px 9px rgba(0,0,0,0.08);
+    cursor: pointer;
+    font-size: 14px;
+    font-family: 微软雅黑;
+    }
  
-        .sub_lines>span.line_btn.destroy{
-            background: #ff5c5c;
-        }
+    .sub_lines>span.line_btn.destroy{
+    background: #ff5c5c;
+    }
  
-        .sub_lines>span.line_btn.destroy:hover{
-            background: #ff7373;
-        }
+    .sub_lines>span.line_btn.destroy:hover{
+    background: #ff7373;
+    }
  
-        .sub_lines>span.line_btn:hover{
-            background: #2dd7ed;
-        }
-        .add_line_icon{
-            cursor: pointer;
-            padding: 2px 5px;
-            border-radius: 5px;
-            display: inline-block;
-        }
-        .add_line_icon>i{
-            vertical-align: top;
-            margin-top: 3px;
-        }
-        .add_line_icon:hover{
-            background: #ededed;
-        }
-        .ct_pattern_form{
-            display: inline-block;
-        }
-        .xd_menu_grid{
-            padding: 25px 25px 0 25px;
-            height: calc(63% - 91px);
-        }
-        .xd_menu_grid .uk-list{
-            border: 1px solid #ededed;
-            height: calc(100% - 70px);
-            overflow: auto;
-            position: relative;
-        }
+    .sub_lines>span.line_btn:hover{
+    background: #2dd7ed;
+    }
+    .add_line_icon{
+    cursor: pointer;
+    padding: 2px 5px;
+    border-radius: 5px;
+    display: inline-block;
+    }
+    .add_line_icon>i{
+    vertical-align: top;
+    margin-top: 3px;
+    }
+    .add_line_icon:hover{
+    background: #ededed;
+    }
+    .ct_pattern_form{
+    display: inline-block;
+    }
+    .xd_menu_grid{
+    padding: 25px 25px 0 25px;
+    height: calc(63% - 91px);
+    }
+    .xd_menu_grid .uk-list{
+    border: 1px solid #ededed;
+    height: calc(100% - 70px);
+    overflow: auto;
+    position: relative;
+    }
  
-        .xd_menu_grid .uk-list>li{
-            margin: 5px 0 !important;
-            padding: 10px 0 0 10px !important;
-            font-size: 14px;
-        }
-        .top_tools{
-            position: absolute;
-            top: 15px;
-            right: 25px;
-        }
-        .ct_field {
-            display: inline-block;
-            width: 240px;
-        }
-        .ct_field>select,.ct_field>input{
-            width: calc(100% - 60px);
-        }
-        .line_checkbox_list{
-            margin-top: 15px;
-        }
-        .line_checkbox_list>.btn{
-            padding: 5px 7px;
-            border-radius: 2px;
-            display: inline-block;
-            margin: 4px 9px;
-            font-size: 14px;
-            font-family: 微软雅黑;
-            border: 1px solid #d9d9d9;
-            width: 100px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
-        .line_checkbox_list>.btn>input{
-            margin-right: 5px;
-        }
-        .line_checkbox_list>.btn.active{
-            background: #1e87f0;
-            color: #fff;
-        }
+    .xd_menu_grid .uk-list>li{
+    margin: 5px 0 !important;
+    padding: 10px 0 0 10px !important;
+    font-size: 14px;
+    }
+    .top_tools{
+    position: absolute;
+    top: 15px;
+    right: 25px;
+    }
+    .ct_field {
+    display: inline-block;
+    width: 240px;
+    }
+    .ct_field>select,.ct_field>input{
+    width: calc(100% - 60px);
+    }
+    .line_checkbox_list{
+    margin-top: 15px;
+    }
+    .line_checkbox_list>.btn{
+    padding: 5px 7px;
+    border-radius: 2px;
+    display: inline-block;
+    margin: 4px 9px;
+    font-size: 14px;
+    font-family: 微软雅黑;
+    border: 1px solid #d9d9d9;
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    }
+    .line_checkbox_list>.btn>input{
+    margin-right: 5px;
+    }
+    .line_checkbox_list>.btn.active{
+    background: #1e87f0;
+    color: #fff;
+    }
  
-        .line_checkbox_list>.btn.destroy,
-        .line_checkbox_list>.btn.destroy>input{
-            border-color: #ff9595;
-            color: #ff5c5c;
-        }
+    .line_checkbox_list>.btn.destroy,
+    .line_checkbox_list>.btn.destroy>input{
+    border-color: #ff9595;
+    color: #ff5c5c;
+    }
  
-        .line_checkbox_list>.btn.destroy.active{
-            background: #ff5c5c;
-            color: #fff;
-        }
+    .line_checkbox_list>.btn.destroy.active{
+    background: #ff5c5c;
+    color: #fff;
+    }
  
-        .line_checkbox_list>.btn.destroy.active>input{
-            background-color: #ff5c5c !important;
-            border-color: #ff5c5c !important;
-        }
+    .line_checkbox_list>.btn.destroy.active>input{
+    background-color: #ff5c5c !important;
+    border-color: #ff5c5c !important;
+    }
  
-        #role_authorize_wrap .ztree *{
-            font-size: 14px;
-        }
-        #role_authorize_wrap .ztree li{
-            line-height: 21px;
-        }
-        .loading{
-            height: 100%;
-            text-align: center;
-        }
-        .loading .uk-spinner{
-            margin-top: 200px;
-        }
-        .loading circle{
-            stroke: red;
-        }
+    #role_authorize_wrap .ztree *{
+    font-size: 14px;
+    }
+    #role_authorize_wrap .ztree li{
+    line-height: 21px;
+    }
+    .loading{
+    height: 100%;
+    text-align: center;
+    }
+    .loading .uk-spinner{
+    margin-top: 200px;
+    }
+    .loading circle{
+    stroke: red;
+    }
  
-        #select_line_modal .uk-checkbox:checked {
-            background-color: #1e87f0;
-        }
+    #select_line_modal .uk-checkbox:checked {
+    background-color: #1e87f0;
+    }
     </style>
+
 </head>
  
 <body>
@@ -342,6 +355,7 @@
  
             </div>
         </div>
+
     </div>
 </div>
  
@@ -359,18 +373,6 @@
     <li class="uk-animation-fade uk-animation-fast" data-name="{{u.name}}" data-code="{{u.userNameUp}}" data-id="{{u.id}}">{{u.name}}<span class="role-code">{{u.userName}}</span></li>
     {{/each}}
 </script>
-<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
-<script src="/assets/js/common.js"></script>
-<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
-<!-- EventProxy  -->
-<script src="/assets/js/eventproxy.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
-<script src="/assets/plugins/ztree_v3/js/jquery.ztree.core.min.js"></script>
-<script src="/assets/plugins/ztree_v3/js/jquery.ztree.excheck.min.js"></script>
 <script>
     var storage = window.localStorage;
  
@@ -464,8 +466,6 @@
     paramsRole['codeName'] = 'ROLE_ADMIN';
     var userId=storage.getItem("editUser");
     $get('/user',{id_eq:userId}, function (rs) {
-        debugger
-        //if (rs)
         ep.emit('query_roles', rs.content[0].roles);
     });
  
-<iframe src="authorize.html?origin=real_control_iframe" frameborder="0" style="height: 90%;width: 100%;"></iframe>
+<iframe src="/pages/permission/user/authorize.html?origin=real_control_iframe" frameborder="0" style="height: 90%;width: 100%;"></iframe>
 <div class="form-actions">
     <div class="row">
         <div class="col-md-offset-3 col-md-4">
-            <!--<a href="main.html" class="btn green" ><i class="fa fa-check"></i> 上一步</a>-->
-            <!--<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>-->
-            <!--<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>-->
         </div>
     </div>
 </div>
 \ No newline at end of file