| Line 61... |
Line 61... |
| 61 |
private TicketSubCategoryRepository ticketSubCategoryRepository;
|
61 |
private TicketSubCategoryRepository ticketSubCategoryRepository;
|
| 62 |
|
62 |
|
| 63 |
@Autowired
|
63 |
@Autowired
|
| 64 |
private RegionRepository regionRepository;
|
64 |
private RegionRepository regionRepository;
|
| 65 |
|
65 |
|
| 66 |
|
- |
|
| 67 |
@Autowired
|
66 |
@Autowired
|
| 68 |
private RetailerService retailerService;
|
67 |
private RetailerService retailerService;
|
| 69 |
|
68 |
|
| 70 |
@Autowired
|
69 |
@Autowired
|
| 71 |
private MVCResponseSender mvcResponseSender;
|
70 |
private MVCResponseSender mvcResponseSender;
|
| Line 184... |
Line 183... |
| 184 |
}
|
183 |
}
|
| 185 |
|
184 |
|
| 186 |
@GetMapping(value = "/cs/getPartners")
|
185 |
@GetMapping(value = "/cs/getPartners")
|
| 187 |
public String getPartners(HttpServletRequest request,
|
186 |
public String getPartners(HttpServletRequest request,
|
| 188 |
@RequestParam(name = "regionId", defaultValue = "0") int regionId, Model model) {
|
187 |
@RequestParam(name = "regionId", defaultValue = "0") int regionId, Model model) {
|
| 189 |
List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x->x.getId()).collect(Collectors.toList());
|
188 |
List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
|
| - |
|
189 |
.collect(Collectors.toList());
|
| 190 |
List<Integer> addedfofoIds = partnerRegionRepository.selectByRegionId(regionId).stream().map(x -> x.getFofoId())
|
190 |
List<Integer> addedfofoIds = partnerRegionRepository.selectByRegionId(regionId).stream().map(x -> x.getFofoId())
|
| 191 |
.collect(Collectors.toList());
|
191 |
.collect(Collectors.toList());
|
| - |
|
192 |
|
| 192 |
Map<Integer, CustomRetailer> fofoRetailers = retailerService.getFofoRetailers(fofoIds);
|
193 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
| - |
|
194 |
Map<Integer, CustomRetailer> fofoRetailers = fofoIds.stream().map(x -> customRetailerMap.get(x))
|
| - |
|
195 |
.filter(x -> x != null).collect(Collectors.toList()).stream()
|
| - |
|
196 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 193 |
model.addAttribute("fofoRetailers", fofoRetailers);
|
197 |
model.addAttribute("fofoRetailers", fofoRetailers);
|
| 194 |
model.addAttribute("addedfofoIds", addedfofoIds);
|
198 |
model.addAttribute("addedfofoIds", addedfofoIds);
|
| 195 |
return "added-region-partners";
|
199 |
return "added-region-partners";
|
| 196 |
}
|
200 |
}
|
| 197 |
|
201 |
|
| Line 205... |
Line 209... |
| 205 |
if (fofoIds.contains(0)) {
|
209 |
if (fofoIds.contains(0)) {
|
| 206 |
fofoIds = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).collect(Collectors.toList())
|
210 |
fofoIds = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).collect(Collectors.toList())
|
| 207 |
.stream().map(x -> x.getId()).collect(Collectors.toList());
|
211 |
.stream().map(x -> x.getId()).collect(Collectors.toList());
|
| 208 |
|
212 |
|
| 209 |
}
|
213 |
}
|
| 210 |
Map<Integer, CustomRetailer> fofoRetailers = retailerService.getFofoRetailers(fofoIds);
|
214 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
| 211 |
|
215 |
|
| - |
|
216 |
Map<Integer, CustomRetailer> fofoRetailers = fofoIds.stream().map(x -> customRetailerMap.get(x))
|
| - |
|
217 |
.filter(x -> x != null).collect(Collectors.toList()).stream()
|
| - |
|
218 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 212 |
model.addAttribute("fofoRetailers", fofoRetailers);
|
219 |
model.addAttribute("fofoRetailers", fofoRetailers);
|
| 213 |
return "added-subregion-partners";
|
220 |
return "added-subregion-partners";
|
| 214 |
}
|
221 |
}
|
| 215 |
|
222 |
|
| 216 |
@GetMapping(value = "/cs/createPartnerRegion")
|
223 |
@GetMapping(value = "/cs/createPartnerRegion")
|
| Line 233... |
Line 240... |
| 233 |
|
240 |
|
| 234 |
@GetMapping(value = "/cs/getPosition")
|
241 |
@GetMapping(value = "/cs/getPosition")
|
| 235 |
public String getPosition(HttpServletRequest request, @RequestParam int positionId, Model model) {
|
242 |
public String getPosition(HttpServletRequest request, @RequestParam int positionId, Model model) {
|
| 236 |
|
243 |
|
| 237 |
Position position = positionRepository.selectById(positionId);
|
244 |
Position position = positionRepository.selectById(positionId);
|
| 238 |
|
- |
|
| 239 |
|
245 |
|
| 240 |
List<CustomRetailer> positionIdCustomRetailer = csService.getPositionCustomRetailerMap(Arrays.asList(position))
|
246 |
List<CustomRetailer> positionIdCustomRetailer = csService.getPositionCustomRetailerMap(Arrays.asList(position))
|
| 241 |
.get(position.getId());
|
247 |
.get(position.getId());
|
| 242 |
|
248 |
|
| 243 |
Map<Integer, CustomRetailer> regionRetailerMap = csService.getRegionPartners(Arrays.asList(position))
|
249 |
Map<Integer, CustomRetailer> regionRetailerMap = csService.getRegionPartners(Arrays.asList(position))
|
| 244 |
.get(position.getRegionId()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
250 |
.get(position.getRegionId()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 245 |
|
251 |
|
| 246 |
|
- |
|
| 247 |
model.addAttribute("position", position);
|
252 |
model.addAttribute("position", position);
|
| 248 |
model.addAttribute("regionRetailerMap", regionRetailerMap);
|
253 |
model.addAttribute("regionRetailerMap", regionRetailerMap);
|
| 249 |
model.addAttribute("positionIdCustomRetailer", positionIdCustomRetailer);
|
254 |
model.addAttribute("positionIdCustomRetailer", positionIdCustomRetailer);
|
| 250 |
|
- |
|
| 251 |
|
255 |
|
| 252 |
return "position-partner";
|
256 |
return "position-partner";
|
| 253 |
}
|
257 |
}
|
| 254 |
|
258 |
|
| 255 |
@GetMapping(value = "/cs/createPosition")
|
259 |
@GetMapping(value = "/cs/createPosition")
|
| Line 262... |
Line 266... |
| 262 |
model.addAttribute("escalationTypes", EscalationType.values());
|
266 |
model.addAttribute("escalationTypes", EscalationType.values());
|
| 263 |
model.addAttribute("authUsers", authUsers);
|
267 |
model.addAttribute("authUsers", authUsers);
|
| 264 |
model.addAttribute("ticketCategories", ticketCategories);
|
268 |
model.addAttribute("ticketCategories", ticketCategories);
|
| 265 |
model.addAttribute("regions", regions);
|
269 |
model.addAttribute("regions", regions);
|
| 266 |
|
270 |
|
| 267 |
|
- |
|
| 268 |
List<Position> positions = positionRepository.selectAllPosition();
|
271 |
List<Position> positions = positionRepository.selectAllPosition();
|
| 269 |
LOGGER.info("positions"+positions);
|
272 |
LOGGER.info("positions" + positions);
|
| 270 |
|
273 |
|
| 271 |
Map<Integer, AuthUser> authUserIdAndAuthUserMap = csService
|
274 |
Map<Integer, AuthUser> authUserIdAndAuthUserMap = csService
|
| 272 |
.getAuthUserIdAndAuthUserMapUsingPositions(positions);
|
275 |
.getAuthUserIdAndAuthUserMapUsingPositions(positions);
|
| 273 |
Map<Integer, TicketCategory> categoryIdAndCategoryMap = csService
|
276 |
Map<Integer, TicketCategory> categoryIdAndCategoryMap = csService
|
| 274 |
.getCategoryIdAndCategoryUsingPositions(positions);
|
277 |
.getCategoryIdAndCategoryUsingPositions(positions);
|
| 275 |
Map<Integer, Region> regionIdAndRegionMap = csService.getRegionIdAndRegionMap(positions);
|
278 |
Map<Integer, Region> regionIdAndRegionMap = csService.getRegionIdAndRegionMap(positions);
|
| Line 278... |
Line 281... |
| 278 |
// .getpositionIdAndpartnerRegionMap(positions);
|
281 |
// .getpositionIdAndpartnerRegionMap(positions);
|
| 279 |
|
282 |
|
| 280 |
// Map<Integer, List<CustomRetailer>> addedpositionIdAndCustomRetailerMap = csService
|
283 |
// Map<Integer, List<CustomRetailer>> addedpositionIdAndCustomRetailerMap = csService
|
| 281 |
// .getPositionCustomRetailerMap(positions);
|
284 |
// .getPositionCustomRetailerMap(positions);
|
| 282 |
// LOGGER.info("fofoIdAndCustomRetailerMap" + addedpositionIdAndCustomRetailerMap);
|
285 |
// LOGGER.info("fofoIdAndCustomRetailerMap" + addedpositionIdAndCustomRetailerMap);
|
| 283 |
|
- |
|
| 284 |
|
286 |
|
| 285 |
model.addAttribute("start", offset + 1);
|
287 |
model.addAttribute("start", offset + 1);
|
| 286 |
|
288 |
|
| 287 |
model.addAttribute("positions", positions);
|
289 |
model.addAttribute("positions", positions);
|
| 288 |
model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
|
290 |
model.addAttribute("authUserIdAndAuthUserMap", authUserIdAndAuthUserMap);
|
| 289 |
model.addAttribute("categoryIdAndCategoryMap", categoryIdAndCategoryMap);
|
291 |
model.addAttribute("categoryIdAndCategoryMap", categoryIdAndCategoryMap);
|
| 290 |
model.addAttribute("regionIdAndRegionMap", regionIdAndRegionMap);
|
292 |
model.addAttribute("regionIdAndRegionMap", regionIdAndRegionMap);
|
| 291 |
// model.addAttribute("positionIdAndCustomRetailerMap",
|
293 |
// model.addAttribute("positionIdAndCustomRetailerMap",
|