设备启用日期使用服务器后台时间

徐烜
1 parent 7d7859c5
Showing 3 changed files with 7 additions and 3 deletions
src/main/java/com/bsth/service/schedule/impl/CarDeviceServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
@@ -12,6 +12,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
  
@@ -29,6 +30,8 @@ public class CarDeviceServiceImpl extends BServiceImpl&lt;CarDevice, Long&gt; implemen
         // 查找对应的车辆基础信息，更新设备编号数据
         Cars cars = carsService.findById(carDevice.getCl());
         cars.setEquipmentCode(carDevice.getNewDeviceNo());
+        // 设备启用日期使用后台日期
+        carDevice.setQyrq(new Date());
         return super.save(carDevice);
     }
  
@@ -164,7 +164,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             self.submit = function() {
                 console.log(self.deviceInfoForSave);
                 // 修改逻辑，只有新增，没有修改，作废，启用日期就是保存的日期
-                self.deviceInfoForSave.qyrq = new Date().getTime();
+                // 使用后台日期，不用前台日期
+                // self.deviceInfoForSave.qyrq = new Date().getTime();
  
                 // 保存或者更新
                 self.deviceInfoForSave.$save(function() {
@@ -176,8 +176,8 @@
                        <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑2 </a>-->
                     <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true, lineversion : info.lineVersion})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>
-                    <a ng-click="ctrl.toTtInfoDetailAuto(info.id)"
-                       class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>
+                    <!--<a ng-click="ctrl.toTtInfoDetailAuto(info.id)"-->
+                       <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>-->
                     <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a>
                     <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a>