1、车辆设备管理，只有新增，没有修改、作废，启用日期使用保存的时间

2、调度值勤日报，修改人员时，后台加入人员是否配置在当前线路下的检测，前台使用remoteValidate指令检测

1、车辆设备管理，只有新增，没有修改、作废，启用日期使用保存的时间
2、调度值勤日报，修改人员时，后台加入人员是否配置在当前线路下的检测，前台使用remoteValidate指令检测
徐烜
1 parent f55db84b
Showing 9 changed files with 196 additions and 27 deletions
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController.java
src/main/java/com/bsth/service/schedule/EmployeeConfigInfoService.java
src/main/java/com/bsth/service/schedule/impl/EmployeeConfigInfoServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice-legacy.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/edit.html
@@ -70,6 +70,27 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         return rtn;
     }
+    @RequestMapping(value = "/validate_jsy_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_jsy_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    param.get("jsy.id_eq"),
+                    null
+            );
+            employeeConfigInfoService.validate_jsy_config(employeeConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+
+        return rtn;
+    }
+
     @RequestMapping(value = "/validate_spy", method = RequestMethod.GET)
     public Map<String, Object> validate_spy(@RequestParam Map<String, Object> param) {
         Map<String, Object> rtn = new HashMap<>();
@@ -89,4 +110,24 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
         }
         return rtn;
     }
+
+    @RequestMapping(value = "/validate_spy_config", method = RequestMethod.GET)
+    public Map<String, Object> validate_spy_config(@RequestParam Map<String, Object> param) {
+        Map<String, Object> rtn = new HashMap<>();
+        try {
+            EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
+                    null,
+                    param.get("xl.id_eq"),
+                    param.get("xl.name_eq"),
+                    null,
+                    param.get("spy.id_eq")
+            );
+            employeeConfigInfoService.validate_spy_config(employeeConfigInfo);
+            rtn.put("status", ResponseCode.SUCCESS);
+        } catch (ScheduleException exp) {
+            rtn.put("status", ResponseCode.ERROR);
+            rtn.put("msg", exp.getMessage());
+        }
+        return rtn;
+    }
 }
@@ -7,8 +7,14 @@ import com.bsth.service.schedule.exception.ScheduleException;
  * Created by xu on 16/5/10.
  */
 public interface EmployeeConfigInfoService extends BService<EmployeeConfigInfo, Long> {
+    // 验证驾驶员配置是否重复配置
     void validate_jsy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
+    // 验证售票员配置是否重复配置
     void validate_spy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
+    // 验证驾驶员是否配置在指定线路
+    void validate_jsy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
+    // 验证售票员是否配置在指定线路
+    void validate_spy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException;
     void toggleCancel(Long id) throws ScheduleException;
     Long getMaxDbbm(Integer xlId);
 }
@@ -100,6 +100,18 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
     @Transactional
     @Override
+    public void validate_jsy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException {
+        Map<String, Object> param = new HashMap<>();
+        param.put("xl.id_eq", employeeConfigInfo.getXl().getId());
+        param.put("jsy.id_eq", employeeConfigInfo.getJsy().getId());
+        List<EmployeeConfigInfo> employeeConfigInfos = list(param);
+        if (CollectionUtils.isEmpty(employeeConfigInfos)) {
+            throw new ScheduleException("驾驶员没有配置在当前线路中，不属于当前线路！");
+        }
+    }
+
+    @Transactional
+    @Override
     public void validate_spy(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException {
         // 售票员不能重复配置
         Map<String, Object> param = new HashMap<>();
@@ -127,6 +139,18 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl&lt;EmployeeConfigIn
     @Transactional
     @Override
+    public void validate_spy_config(EmployeeConfigInfo employeeConfigInfo) throws ScheduleException {
+        Map<String, Object> param = new HashMap<>();
+        param.put("xl.id_eq", employeeConfigInfo.getXl().getId());
+        param.put("spy.id_eq", employeeConfigInfo.getSpy().getId());
+        List<EmployeeConfigInfo> employeeConfigInfos = list(param);
+        if (CollectionUtils.isEmpty(employeeConfigInfos)) {
+            throw new ScheduleException("售票员没有配置在当前线路中，不属于当前线路！");
+        }
+    }
+
+    @Transactional
+    @Override
     public void delete(Long aLong) throws ScheduleException {
         toggleCancel(aLong);
     }
@@ -166,26 +166,26 @@
                     <!--</div>-->
                 <!--</div>-->
-                <div class="form-group has-success has-feedback">
-                    <label class="col-md-2 control-label">启用日期：</label>
-                    <div class="col-md-3">
-                        <div class="input-group">
-                            <input type="datetime-local" class="form-control" name="qyrq"
-                                   ng-model="ctrl.deviceInfoForSave.qyrq" required
-                                   remote-Validation
-                                   remotevtype="cde1"
-                                   remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />
-
-                        </div>
-                    </div>
-                    <!-- 隐藏块，显示验证信息 -->
-                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
-                        启用日期必须选择，精确到具体时间
-                    </div>
-                    <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
-                        {{$remote_msg}}
-                    </div>
-                </div>
+                <!--<div class="form-group has-success has-feedback">-->
+                    <!--<label class="col-md-2 control-label">启用日期：</label>-->
+                    <!--<div class="col-md-3">-->
+                        <!--<div class="input-group">-->
+                            <!--<input type="datetime-local" class="form-control" name="qyrq"-->
+                                   <!--ng-model="ctrl.deviceInfoForSave.qyrq" required-->
+                                   <!--remote-Validation-->
+                                   <!--remotevtype="cde1"-->
+                                   <!--remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />-->
+
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--&lt;!&ndash; 隐藏块，显示验证信息 &ndash;&gt;-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">-->
+                        <!--启用日期必须选择，精确到具体时间-->
+                    <!--</div>-->
+                    <!--<div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">-->
+                        <!--{{$remote_msg}}-->
+                    <!--</div>-->
+                <!--</div>-->
                 <!-- 其他form-group -->
@@ -101,13 +101,13 @@
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                     <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
                     <a ui-sref="deviceInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
-                    <a ui-sref="deviceInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>
-                    <a sweetalert
-                       sweet-options="{title: '是否作废车辆设备历史信息？',text: '内部编号：' + info.clZbh, html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
-                       sweet-on-confirm="ctrl.toggleCarDevice(info.id)"
-                       class="btn btn-danger btn-sm"
-                       ng-if="info.isCancel == '0'">作废</a>
-                    <a ng-click="ctrl.toggleCarDevice(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>
+                    <!--<a ui-sref="deviceInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 修改 </a>-->
+                    <!--<a sweetalert-->
+                       <!--sweet-options="{title: '是否作废车辆设备历史信息？',text: '内部编号：' + info.clZbh, html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"-->
+                       <!--sweet-on-confirm="ctrl.toggleCarDevice(info.id)"-->
+                       <!--class="btn btn-danger btn-sm"-->
+                       <!--ng-if="info.isCancel == '0'">作废</a>-->
+                    <!--<a ng-click="ctrl.toggleCarDevice(info.id)" class="btn btn-success btn-sm" ng-if="info.isCancel == '1'"> 撤销 </a>-->
                 </td>
             </tr>
             </tbody>
@@ -163,6 +163,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 提交方法
             self.submit = function() {
                 console.log(self.deviceInfoForSave);
+                // 修改逻辑，只有新增，没有修改，作废，启用日期就是保存的日期
+                self.deviceInfoForSave.qyrq = new Date().getTime();
                 // 保存或者更新
                 self.deviceInfoForSave.$save(function() {
@@ -453,6 +453,18 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+            ec_jsy_config: { // 驾驶员是否配置在指定线路中
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'jsy.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/eci/validate_jsy_config',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
             ec_spy: { // 售票员不能重复配置
                 template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'spy.id_eq': -1}, // 查询参数模版
                 remote: $resource( // $resource封装对象
@@ -465,6 +477,18 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+            ec_spy_config: { // 售票员是否配置在指定线路中
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'spy.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/eci/validate_spy_config',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
             cde1: { // 车辆设备启用日期验证
                 template: {'xl_eq': -1, 'cl_eq': -1, 'qyrq_eq': 1}, // 日期毫秒
@@ -1331,6 +1331,18 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+            ec_jsy_config: { // 驾驶员是否配置在指定线路中
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'jsy.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/eci/validate_jsy_config',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
             ec_spy: { // 售票员不能重复配置
                 template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'spy.id_eq': -1}, // 查询参数模版
                 remote: $resource( // $resource封装对象
@@ -1343,6 +1355,18 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;$$SearchInfoService_g&#39;, [&#39;$resource&#39;, fun
                     }
                 )
             },
+            ec_spy_config: { // 售票员是否配置在指定线路中
+                template: {'xl.id_eq': -1, 'xl.name_eq': '-1', 'spy.id_eq': -1}, // 查询参数模版
+                remote: $resource( // $resource封装对象
+                    '/eci/validate_spy_config',
+                    {},
+                    {
+                        do: {
+                            method: 'GET'
+                        }
+                    }
+                )
+            },
             cde1: { // 车辆设备启用日期验证
                 template: {'xl_eq': -1, 'cl_eq': -1, 'qyrq_eq': 1}, // 日期毫秒
@@ -129,6 +129,14 @@
                             <div class="alert alert-danger well-sm" ng-show="myForm.j1.$error.required">
                                 驾驶员必须选择
                             </div>
+
+                            <input type="hidden" name="j1_h" ng-model="ctrl.formData.j1.id"
+                                   remote-Validation
+                                   remotevtype="ec_jsy_config"
+                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'jsy.id_eq': ctrl.formData.j1.id} | json}}" />
+                            <div class="alert alert-danger well-sm" ng-show="myForm.j1_h.$error.remote">
+                                {{$remote_msg}}
+                            </div>
                         </div>
                         <div class="form-group">
@@ -147,6 +155,14 @@
                                         >
                                 </sa-Select5>
                             </div>
+
+                            <input type="hidden" name="s1_h" ng-model="ctrl.formData.s1.id"
+                                   remote-Validation
+                                   remotevtype="ec_spy_config"
+                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s1.id} | json}}" />
+                            <div class="alert alert-danger well-sm" ng-show="myForm.s1_h.$error.remote">
+                                {{$remote_msg}}
+                            </div>
                         </div>
                         <div class="form-group">
@@ -165,6 +181,14 @@
                                         >
                                 </sa-Select5>
                             </div>
+
+                            <input type="hidden" name="j2_h" ng-model="ctrl.formData.j2.id"
+                                   remote-Validation
+                                   remotevtype="ec_jsy_config"
+                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'jsy.id_eq': ctrl.formData.j2.id} | json}}" />
+                            <div class="alert alert-danger well-sm" ng-show="myForm.j2_h.$error.remote">
+                                {{$remote_msg}}
+                            </div>
                         </div>
                         <div class="form-group">
@@ -183,6 +207,14 @@
                                         >
                                 </sa-Select5>
                             </div>
+
+                            <input type="hidden" name="s2_h" ng-model="ctrl.formData.s2.id"
+                                   remote-Validation
+                                   remotevtype="ec_spy_config"
+                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s2.id} | json}}" />
+                            <div class="alert alert-danger well-sm" ng-show="myForm.s2_h.$error.remote">
+                                {{$remote_msg}}
+                            </div>
                         </div>
                         <div class="form-group">
@@ -201,6 +233,14 @@
                                         >
                                 </sa-Select5>
                             </div>
+
+                            <input type="hidden" name="j3_h" ng-model="ctrl.formData.j3.id"
+                                   remote-Validation
+                                   remotevtype="ec_jsy_config"
+                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'jsy.id_eq': ctrl.formData.j3.id} | json}}" />
+                            <div class="alert alert-danger well-sm" ng-show="myForm.j3_h.$error.remote">
+                                {{$remote_msg}}
+                            </div>
                         </div>
                         <div class="form-group">
@@ -219,6 +259,14 @@
                                         >
                                 </sa-Select5>
                             </div>
+
+                            <input type="hidden" name="s3_h" ng-model="ctrl.formData.s3.id"
+                                   remote-Validation
+                                   remotevtype="ec_spy_config"
+                                   remotevparam="{{ {'xl.id_eq': ctrl.xlId, 'xl.name_eq': ctrl.xlName, 'spy.id_eq': ctrl.formData.s3.id} | json}}" />
+                            <div class="alert alert-danger well-sm" ng-show="myForm.s3_h.$error.remote">
+                                {{$remote_msg}}
+                            </div>
                         </div>
                         <div class="form-group">