diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index d77154b6e..8e2b0ec3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -85,11 +85,18 @@ public class CarInfoController { public Result save(@RequestBody Map map) { Object alarmPushWorkerId = map.get("alarmPushWorkerId"); Object enterpriseId = map.get("enterpriseId"); + Object driverWorkerName = map.get("driverWorkerName"); List carType = (List) map.get("carType"); List driverWorkerId = (List) map.get("driverWorkerId"); - Integer carModuleType = MapUtils.getString(map, "carModuleType").equals("临时车辆") ? 2 : 1; + Integer carModuleType = MapUtils.getString(map, "carModuleType").equals("临时车辆") ? 2 : 3; CarInfo carInfo = new CarInfo(); + if(driverWorkerId != null) { + carInfo.setDriverWorkerId(driverWorkerId.get(0).toString()); + } + if(driverWorkerName != null) { + carInfo.setDriverWorkerName(driverWorkerName.toString()); + } if (alarmPushWorkerId != null) { List alarmPushWorkerIds = (List) alarmPushWorkerId; carInfo.setAlarmPushWorkerId(alarmPushWorkerIds.get(0).toString()); @@ -111,7 +118,6 @@ public class CarInfoController { carInfo.setCarNumber(map.get("carNumber").toString()); carInfo.setCarColor(map.get("carColor").toString()); carInfo.setCarType(Long.valueOf(carType.get(0).toString())); - carInfo.setDriverWorkerId(driverWorkerId.get(0).toString()); carInfo.setDriverTelephone(map.get("driverTelephone").toString()); List> carPhotosUrl = (List>) map.get("carPhotosUrl"); List> carPhotosUrls = new ArrayList<>(); @@ -123,7 +129,51 @@ public class CarInfoController { carPhotosUrls.add(teMap); } } + List> jsz = (List>) map.get("jsz"); + List> jszList = new ArrayList<>(); + if (jsz != null) { + for (Map file : jsz) { + Map teMap = new HashMap<>(); + teMap.put("name", file.get("name")); + teMap.put("url", file.get("url")); + jszList.add(teMap); + } + } + List> xsz = (List>) map.get("xsz"); + List> xszList = new ArrayList<>(); + if (xsz != null) { + for (Map file : xsz) { + Map teMap = new HashMap<>(); + teMap.put("name", file.get("name")); + teMap.put("url", file.get("url")); + xszList.add(teMap); + } + } + List> jqx = (List>) map.get("jqx"); + List> jqxList = new ArrayList<>(); + if (jqx != null) { + for (Map file : jqx) { + Map teMap = new HashMap<>(); + teMap.put("name", file.get("name")); + teMap.put("url", file.get("url")); + jqxList.add(teMap); + } + } + List> otherProve = (List>) map.get("otherProve"); + List> otherProveList = new ArrayList<>(); + if (otherProve != null) { + for (Map file : otherProve) { + Map teMap = new HashMap<>(); + teMap.put("name", file.get("name")); + teMap.put("url", file.get("url")); + otherProveList.add(teMap); + } + } carInfo.setCarPhotosUrl(JSON.toJSONString(carPhotosUrls)); + carInfo.setJsz(JSON.toJSONString(jszList)); + carInfo.setXsz(JSON.toJSONString(xszList)); + carInfo.setJqx(JSON.toJSONString(jqxList)); + carInfo.setOtherProve(JSON.toJSONString(otherProveList)); carInfo.setProjectSn(map.get("projectSn").toString()); carInfo.setIsBlack(MapUtils.getInteger(map, "isBlack")); carInfoService.addCarInfo(carInfo);