| | |
| | | |
| | | @Override |
| | | public List<Map<String, Object>> getPrivateCarOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, |
| | | String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType) { |
| | | List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType); |
| | | String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType, Integer abnormal, |
| | | Integer promotion, |
| | | String promotionUser, |
| | | Integer abnormalStatus) { |
| | | List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus); |
| | | for (Map<String, Object> map : privateCarOrderList) { |
| | | if(null == map.get("serverCarModelName")){ |
| | | JSONArray jsonArray = JSON.parseArray(map.get("serverCarModel").toString()); |
| | | Set<Integer> ids = new HashSet<>(); |
| | | for (int i = 0; i < jsonArray.size(); i++) { |
| | | JSONObject jsonObject = jsonArray.getJSONObject(i); |
| | | ids.add(jsonObject.getInteger("serverCarModelId")); |
| | | } |
| | | List<TServerCarmodel> serverCarmodels = serverCarmodelService.selectBatchIds(ids); |
| | | String collect = serverCarmodels.stream().map(TServerCarmodel::getName).collect(Collectors.joining("<br/>")); |
| | | if(ids.contains(0)){ |
| | | collect += ToolUtil.isNotEmpty(collect) ? "<br/>出租车" : "出租车"; |
| | | } |
| | | map.put("serverCarModelName", collect); |
| | | } |
| | | } |
| | | return privateCarOrderList; |
| | | } |
| | | @Override |
| | | public List<Map<String, Object>> getPrivateCarOrderListExport(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, |
| | | String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state, Integer rideType, Integer abnormal, |
| | | Integer promotion, |
| | | String promotionUser, |
| | | Integer abnormalStatus) { |
| | | List<Map<String, Object>> privateCarOrderList = this.baseMapper.getPrivateCarOrderListExport(beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,abnormalStatus); |
| | | for (Map<String, Object> map : privateCarOrderList) { |
| | | if(null == map.get("serverCarModelName")){ |
| | | JSONArray jsonArray = JSON.parseArray(map.get("serverCarModel").toString()); |