From 259703a76d60972cc0ba8934b38864fd321005f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 07 十一月 2024 11:39:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
index c11c859..ac79a06 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ParkBookServiceImpl.java
@@ -22,6 +22,7 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -121,6 +122,7 @@
}
hkSyncParkService.syncParkBookBySingleModel(model);
}
+
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public String batchAuth(Cars cars) {
@@ -180,7 +182,7 @@
model.setAuthTimeType(cars.getAuthTimeType());
model.setStartTime(startTime);
model.setEndTime(endTime);
- dealCarAuthByModel(model,cars.getLoginUserInfo(),parksList,date);
+ dealCarAuthByModel(model,cars.getLoginUserInfo().getId(),parksList,date,parkBookMapper);
model.setAuthStatus(Constants.ONE);//宸叉巿鏉�
carsMapper.update(null,new UpdateWrapper<Cars>().lambda()
.eq(Cars::getId,model.getId())
@@ -195,7 +197,7 @@
}
- private int dealCarAuthByModel(Cars model, LoginUserInfo loginUserInfo, List<Parks> parksList,Date date) {
+ public static int dealCarAuthByModel(Cars model, Integer userId, List<Parks> parksList,Date date,ParkBookMapper parkBookMapper) {
//鍒犻櫎杞﹂噺搴撹褰曟暟鎹�
parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
.eq(ParkBook::getCarCode,model.getCode())
@@ -208,8 +210,8 @@
ParkBook parkBook = new ParkBook();
parkBook.setIsdeleted(Constants.ZERO);
parkBook.setCreateDate(date);
- parkBook.setCreator(loginUserInfo.getId());
- parkBook.setEditor(loginUserInfo.getId());
+ parkBook.setCreator(userId);
+ parkBook.setEditor(userId);
parkBook.setEditDate(date);
parkBook.setCarCode(model.getCode());
parkBook.setParkId(parks.getId());
--
Gitblit v1.9.3