admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-05-28 15:14:15 +08:00
commit 2861adee48
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
View File

@ -102,7 +102,7 @@ public class CarInfoController {
public Result<CarInfo> save(@RequestBody Map<String, Object> map) {
log.info("开始添加车辆" + map);
Object alarmPushWorkerId = map.get("alarmPushWorkerId");
String userId = map.get("enterpriseId").toString();
String userId = String.valueOf(map.get("enterpriseId"));
Object driverWorkerName = map.get("driverWorkerName");
List<String> carType = (List<String>) map.get("carType");
List<String> driverWorkerId = (List<String>) map.get("driverWorkerId");
@ -129,10 +129,13 @@ public class CarInfoController {
carInfo.setReserveStartTime(DateUtil.parse(map.get("reserveStartTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
carInfo.setReserveEndTime(DateUtil.parse(map.get("reserveEndTime").toString() + ":00", DatePattern.NORM_DATETIME_FORMAT));
carInfo.setEntryAndExitPermit(entryAndExitPermit);
carInfo.setCarNumber(map.get("carNumber").toString());
carInfo.setCarColor(map.get("carColor").toString());
carInfo.setCarNumber(String.valueOf(map.get("carNumber")));
Object carColor = map.get("carColor");
if (carColor != null) {
carInfo.setCarColor(String.valueOf(carColor));
}
carInfo.setCarType(Long.valueOf(carType.get(0).toString()));
carInfo.setDriverTelephone(map.get("driverTelephone").toString());
carInfo.setDriverTelephone(String.valueOf(map.get("driverTelephone")));
List<Map<String, Object>> carPhotosUrl = (List<Map<String, Object>>) map.get("carPhotosUrl");
List<Map<String, Object>> carPhotosUrls = new ArrayList<>();
if (carPhotosUrl != null) {
@ -191,7 +194,7 @@ public class CarInfoController {
carInfo.setXsz(JSON.toJSONString(xszList));
carInfo.setJqx(JSON.toJSONString(jqxList));
carInfo.setOtherProve(JSON.toJSONString(otherProveList));
carInfo.setProjectSn(map.get("projectSn").toString());
carInfo.setProjectSn(String.valueOf(map.get("projectSn")));
carInfo.setIsBlack(MapUtils.getInteger(map, "isBlack"));
Object outsideDriverIdCard = map.get("outsideDriverIdCard");
if (outsideDriverIdCard != null) {