修改开票管理导出

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,

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<FinVehicleInvoiceExportVo> 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 = "";

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<FinVehicleInvoi
         } else if ("3".equals(orgLevelKey)) {
             qw.eq("v.useOrgSid", query.getCreateOrgSid());
         }
-
+        if (StringUtils.isNotBlank(query.getIsTakeTicket())) {
+            qw.eq("v.isTakeTicket", query.getIsTakeTicket());
+        }
         if (StringUtils.isNotBlank(query.getInvoiceTitle())) {
             qw.like("v.invoiceTitle", query.getInvoiceTitle());
         }
-        if (StringUtils.isNotBlank(query.getInvoiceType())) {
-            qw.like("v.invoiceType", query.getInvoiceType());
-        }
         if (StringUtils.isNotBlank(query.getInvoiceTypeKey())) {
             qw.like("v.invoiceTypeKey", query.getInvoiceTypeKey());
         }
+        if (StringUtils.isNotBlank(query.getInvoiceType())) {
+            qw.like("v.invoiceType", query.getInvoiceType());
+        }
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.like("v.contractNo", query.getContractNo());
         }
         if (StringUtils.isNotBlank(query.getCustomerName())) {
-            qw.like("customerName", query.getCustomerName());
+            qw.like("v.customerName", query.getCustomerName());
         }
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("VIN", query.getVinNo());
+            qw.like("v.VIN", query.getVinNo());
         }
         if (StringUtils.isNotBlank(query.getTransferState())) {
-            qw.eq("transferState", query.getTransferState());
+            qw.eq("v.transferState", query.getTransferState());
         }
         if (StringUtils.isNotBlank(query.getBillingState())) {
-            qw.eq("billingState", query.getBillingState());
+            qw.eq("v.billingState", query.getBillingState());
         }
         if (StringUtils.isNotBlank(query.getTransferStateKey())) {
-            qw.eq("transferStateKey", query.getTransferStateKey());
+            qw.eq("v.transferStateKey", query.getTransferStateKey());
         }
         if (StringUtils.isNotBlank(query.getBillingStateKey())) {
-            qw.eq("billingStateKey", query.getBillingStateKey());
+            qw.eq("v.billingStateKey", query.getBillingStateKey());
         }
         if (StringUtils.isNotBlank(query.getInvoicingName())) {
-            qw.like("invoicingName", query.getInvoicingName());
+            qw.like("v.invoicingName", query.getInvoicingName());
         }
         if (StringUtils.isNotBlank(query.getInvoiceCode())) {
-            qw.like("invoiceCode", query.getInvoiceCode());
+            qw.like("v.invoiceCode", query.getInvoiceCode());
         }
         String createStartTime = query.getCreateStartTime();
         String createEndTime = query.getCreateEndTime();
-        qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%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 (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%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<FinVehicleInvoiceExportVo> invoiceExportVoList = baseMapper.selByExcel(qw);
         int id = 1;

yxt-as/src/main/java/com/yxt/anrui/as/feign/fms/FmsReceivesettleFeign.java

@@ -24,8 +24,8 @@ public interface FmsReceivesettleFeign {
     public ResultBean save(@RequestBody FmsReceivesettleDto dto);
 
     @ApiOperation("根据来源SID获取一条记录")
-    @GetMapping("/fetchBySourceSid/{sid}")
+    @GetMapping("/fetchBySourceSid/{sourceBillSid}")
-    public ResultBean<FmsReceivesettle> fetchBySourceSid(@PathVariable("sid") String sourceBillSid);
+    public ResultBean<FmsReceivesettle> fetchBySourceSid(@PathVariable("sourceBillSid") String sourceBillSid);
 
     @ApiOperation("逻辑删除")
     @PostMapping("/updateIsDelete")