Merge remote-tracking branch 'origin/master'

src/main/java/com/charging/chargingparking/modules/mobileController/ParkingLogController.java

@@ -237,6 +237,14 @@ public class ParkingLogController {
         parkingLog.setReleaseStatus("1");
         parkingLog.setOutType("2");  //2:手动出场
         parkingLog.setRemark("【"+callerId+"】手动出场；"+(parkingLog.getRemark()!=null?parkingLog.getRemark():""));
+        
+        if(parkingLog.getInParkingTime()!=null) {//计算停车时长，分钟
+        	long diff=parkingLog.getOutParkingTime().getTime()-parkingLog.getInParkingTime().getTime();
+        	diff=diff/(1000*60);
+        	parkingLog.setParkingTime((int)diff);
+        	
+        }
+        
         parkingRecordService.updateById(parkingLog);
 		
 		return RespVOBuilder.ok();

src/main/resources/mapper/api/ParkingLogMapper.xml

@@ -128,7 +128,7 @@
     
     <!-- 批量手动出场未标记的停车记录 -->
     <update id="batchOffUnmarkParkingLog">
-    	update base_parking_record  set update_time=now(),out_parking_time=now(),release_status='1',out_type='2',update_by='标记批量出场'
+    	update base_parking_record  set parking_time=TIMESTAMPDIFF(MINUTE,in_parking_time,sysdate()),update_time=now(),out_parking_time=now(),release_status='1',out_type='2',update_by='标记批量出场'
     	where release_status='0'
     	and (mark_in is null or mark_in=false)
     	and id in