diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index 25af472851..781f25ee20 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -127,7 +127,7 @@ v.VIN as vinNo, v.invoicingName, v.invoiceAmount, - v.invoiceDate as createTime, + date_format (v.invoiceDate,'%Y-%m-%d') as createTime, v.invoiceCode, v.invoiceNo, v.filePath, @@ -281,4 +281,4 @@ ORDER BY co.createTime DESC - \ No newline at end of file + diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index 905806a299..271995f36d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -160,20 +160,7 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //得到所有要导出的数据 List records = finVehicleInvoiceService.listExcel(pq); - records.removeAll(Collections.singleton(null)); if (!records.isEmpty()) { - for (FinVehicleInvoiceExportVo invoiceExportVo : records) { - if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) { - String createTime = invoiceExportVo.getCreateTime(); - try { - Date date = sdf.parse(createTime); - String createTimeBySdf = sdf.format(date); - invoiceExportVo.setCreateTime(createTimeBySdf); - } catch (ParseException e) { - e.printStackTrace(); - } - } - } //定义导出的excel名字 String excelName = "开票管理列表"; String fileNameURL = ""; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 49210e2dc9..fe5e9a47b2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -232,47 +232,49 @@ public class FinVehicleInvoiceService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (v.invoiceDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (v.invoiceDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); List invoiceExportVoList = baseMapper.selByExcel(qw); int id = 1; @@ -665,4 +667,4 @@ public class FinVehicleInvoiceService extends MybatisBaseService fetchBySourceSid(@PathVariable("sid") String sourceBillSid); + @GetMapping("/fetchBySourceSid/{sourceBillSid}") + public ResultBean fetchBySourceSid(@PathVariable("sourceBillSid") String sourceBillSid); @ApiOperation("逻辑删除") @PostMapping("/updateIsDelete")