Commit d03f6e3d1665712b2733e49c470a662354df1007
1 parent
f13f92f4
Exists in
dev
拜访报表,收费报表
Showing
1 changed file
with
4 additions
and
9 deletions
Show diff stats
zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
... | ... | @@ -287,7 +287,7 @@ public class McVisitController extends BaseController { |
287 | 287 | ticketTypeList.add("3"); |
288 | 288 | mcVisitVo.setTicketTypeList(ticketTypeList); |
289 | 289 | mcVisitVo.setDefFlag("0"); |
290 | - mcVisitVo.setStatusCode("APPROVED"); | |
290 | +// mcVisitVo.setStatusCode("APPROVED"); | |
291 | 291 | List<McVisitAndIgnition> list = mcVisitService.selectMcVisitAndIgnitionList(mcVisitVo); |
292 | 292 | return getDataTable(list); |
293 | 293 | } |
... | ... | @@ -307,7 +307,7 @@ public class McVisitController extends BaseController { |
307 | 307 | ticketTypeList.add("3"); |
308 | 308 | mcVisitVo.setTicketTypeList(ticketTypeList); |
309 | 309 | mcVisitVo.setDefFlag("0"); |
310 | - mcVisitVo.setStatusCode("APPROVED"); | |
310 | +// mcVisitVo.setStatusCode("APPROVED"); | |
311 | 311 | List<McVisitAndIgnition> list = mcVisitService.selectMcVisitAndIgnitionList(mcVisitVo); |
312 | 312 | return getDataTable(list); |
313 | 313 | } |
... | ... | @@ -325,7 +325,7 @@ public class McVisitController extends BaseController { |
325 | 325 | ticketTypeList.add("3"); |
326 | 326 | mcVisitVo.setTicketTypeList(ticketTypeList); |
327 | 327 | mcVisitVo.setDefFlag("0"); |
328 | - mcVisitVo.setStatusCode("APPROVED"); | |
328 | +// mcVisitVo.setStatusCode("APPROVED"); | |
329 | 329 | List<McVisitAndIgnition> data = mcVisitService.selectMcVisitAndIgnitionList(mcVisitVo); |
330 | 330 | List<VisitListDto> list = new ArrayList<VisitListDto>(); |
331 | 331 | for (McVisitAndIgnition datum : data) { |
... | ... | @@ -392,17 +392,12 @@ public class McVisitController extends BaseController { |
392 | 392 | */ |
393 | 393 | @PostMapping("/chargedListExport") |
394 | 394 | public void chargedListExport(McVisitVo mcVisitVo, HttpServletResponse response) throws IOException { |
395 | - | |
396 | - | |
397 | - | |
398 | - | |
399 | - | |
400 | 395 | List<String> ticketTypeList = new ArrayList<String>(); |
401 | 396 | ticketTypeList.add("2"); |
402 | 397 | ticketTypeList.add("3"); |
403 | 398 | mcVisitVo.setTicketTypeList(ticketTypeList); |
404 | 399 | mcVisitVo.setDefFlag("0"); |
405 | - mcVisitVo.setStatusCode("APPROVED"); | |
400 | +// mcVisitVo.setStatusCode("APPROVED"); | |
406 | 401 | List<McVisitAndIgnition> data = mcVisitService.selectMcVisitAndIgnitionList(mcVisitVo); |
407 | 402 | List<ChargedListDto> list = new ArrayList<ChargedListDto>(); |
408 | 403 | for (McVisitAndIgnition datum : data) { | ... | ... |