Commit e3145f6a authored by neo's avatar neo

[dev] fixed find input detail item

parent 2c91ee79
......@@ -15,6 +15,7 @@ import pwc.taxtech.atms.thirdparty.ExcelSheet;
import pwc.taxtech.atms.thirdparty.ExcelUtil;
import pwc.taxtech.atms.vat.dpo.InputInvoicePreviewQueryParam;
import pwc.taxtech.atms.vat.entity.InputInvoice;
import pwc.taxtech.atms.vat.entity.InputInvoiceDetail;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
import pwc.taxtech.atms.vat.service.impl.InputInvoiceDataImportServiceImpl;
......@@ -110,9 +111,9 @@ public class InputInvoiceImportController {
excelSheetB.setHeaders(header2);
excelSheetB.setSheetName("sheetB");
List<InputVatInvoiceItem> inputInvoiceItemList = new ArrayList<>();
List<InputInvoiceDetail> inputInvoiceItemList = new ArrayList<>();
for (InputInvoice item : list) {
inputInvoiceItemList.addAll(inputInvoiceDataImportService.getInputInvoiceItemTreeViewData(item.getID()));
inputInvoiceItemList.addAll(inputInvoiceDataImportService.getInputInvoiceItemList(item.getID()));
}
excelSheetB.setDataset(inputInvoiceItemList);
List<ExcelSheet<InputVATInvoiceBaseDto>> sheets = new ArrayList<>();
......@@ -137,6 +138,6 @@ public class InputInvoiceImportController {
@RequestMapping(value = "inputInvoiceItemPreviewList/{InputInvoiceId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseEntity GetInputInvoiceItemTreeViewData(@PathVariable String InputInvoiceId) {
return ResponseEntity.ok(inputInvoiceDataImportService.getInputInvoiceItemTreeViewData(InputInvoiceId));
return ResponseEntity.ok(inputInvoiceDataImportService.getInputInvoiceItemList(InputInvoiceId));
}
}
......@@ -60,12 +60,6 @@ public class InputInvoiceDataImportServiceImpl {
return pageInfo;
}
public List<InputVatInvoiceItem> getInputInvoiceItemTreeViewData(String id) {
InputVatInvoiceItemExample example = new InputVatInvoiceItemExample();
example.createCriteria().andInputVATInvoiceIdEqualTo(id);
return inputVATInvoiceItemMapper.selectByExample(example);
}
public List<InputVATInvoiceDto> getInputInvoiceList(Integer period) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment