Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -149,7 +149,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
-        getupKeeps(pageDataVO.getData(), userDTO);
+        getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
@@ -198,7 +198,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus3(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList(), userDTO);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
             vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
             vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
@@ -213,7 +213,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus5(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList(), userDTO);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
             vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
             vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
@@ -228,7 +228,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
             removeStatus7(list);
             PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList(), userDTO);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
             PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
             vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
             vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
@@ -239,7 +239,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         }
         Query query =  new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
-        getupKeeps(pageDataVO.getData(), userDTO);
+        getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
@@ -300,7 +300,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     /**
      * 获取随身物品
      */
-    public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos, UserDTO userDTO) {
+    public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) {
         for (VehicleBookRecordVo vehicleBookRecordVo : vehicleBookRecordVos) {
             if (vehicleBookRecordVo.getBookType() == BookType.MAINTAIN.getCode()) {//获取 保养项目
                 if (StringUtils.isNotBlank(vehicleBookRecordVo.getUpkeepIds())) {
@@ -311,10 +311,13 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                     }
                 }
             }
-            if (userDTO.getCompanyId() != null) {
-                BranchCompany branchCompany = branchCompanyBiz.getById(userDTO.getCompanyId());
-                if (branchCompany != null) {
-                    vehicleBookRecordVo.setUserCompanyName(branchCompany.getName());
+            if (vehicleBookRecordVo.getBookUser() != null) {
+                UserDTO userDTO = userFeign.userinfoByUid(vehicleBookRecordVo.getBookUser()).getData();
+                if(userDTO != null) {
+                    BranchCompany branchCompany = branchCompanyBiz.getById(userDTO.getCompanyId());
+                    if (branchCompany != null) {
+                        vehicleBookRecordVo.setUserCompanyName(branchCompany.getName());
+                    }
                 }
             }
         }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCountRecordBiz.java

@@ -87,7 +87,6 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
-    @Scheduled(cron = "59 59 23 * * ?")
     public void addAll() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;
@@ -197,7 +196,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
                 tourCountRecord.setActualArrivalNum(tourArrivalList.size());
             }
             //内部用车应还车数量
-            List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 1).getData();
+            List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
             if (vehicleArrivalBookRecordList != null && vehicleArrivalBookRecordList.size() > 0) {
                 innerCountRecord.setArrivalNum(vehicleArrivalBookRecordList.size());
                 Map<Integer, Integer> map = getDeparture(vehicleDepartureBookRecordList, 2);
@@ -226,6 +225,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
      *
      * @return
      */
+    @Scheduled(cron = "0 0 2 * * ?")
     public void add() {
         Long nowTime = getDayStart();
         Long lastTime = nowTime + 24 * 3600 * 1000 - 1;
@@ -325,7 +325,7 @@ public class VehicleCountRecordBiz extends BaseBiz<VehicleCountRecordMapper, Veh
             tourCountRecord.setActualArrivalNum(tourArrivalList.size());
         }
         //内部用车应还车数量
-        List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 1).getData();
+        List<VehicleBookRecordVo> vehicleArrivalBookRecordList = vehicleBookRecordBiz.selectAllBookRecord(startTime, endTime, 2).getData();
         if (vehicleArrivalBookRecordList != null && vehicleArrivalBookRecordList.size() > 0) {
             innerCountRecord.setArrivalNum(vehicleArrivalBookRecordList.size());
             Map<Integer, Integer> map = getDeparture(vehicleDepartureBookRecordList, 2);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCountRecordController.java

@@ -23,7 +23,7 @@ public class VehicleCountRecordController {
     @GetMapping("/app/unauth/test")
     @ResponseBody
     public ObjectRestResponse add() {
-        vehicleCountRecordBiz.add();
+        vehicleCountRecordBiz.addAll();
         return ObjectRestResponse.succ();
     }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleCountRecordMapper.xml

@@ -29,7 +29,7 @@
           and type = #{type}
       </if>
       <if test="startTime != null">
-          and count_date &gt;= #{startTime} and count_date &lt;= #{endTime}
+          and count_date = #{startTime}
       </if>
     </where>
     order by id DESC