فهرست منبع

部门开票导出修改

yewc 10 ماه پیش
والد
کامیت
678e7e38ed

+ 3 - 1
client/src/views/OaSystem/financialManagement/kpglPage/deptIndex.vue

@@ -281,8 +281,10 @@ const getExportContractInvoiceListExcel = async () => {
   const sendData = {}
   if (idList.value.length > 0) {
     sendData['idList'] = idList.value
+  } else {
+    sendData.value = queryParams
   }
-  const data = await kpglApi.exportContractInvoiceListExcel(sendData)
+  const data = await kpglApi.exportContractInvoiceListExcel(queryParams)
   download.excel(data, '开票台账导出记录.xls')
 }
 const loading = ref(true) // 列表的加载中

+ 2 - 1
zjugis-business/src/main/java/com/zjugis/business/bean/response/ContractInvoiceExcelResponse.java

@@ -10,7 +10,8 @@ import lombok.Data;
  */
 @Data
 public class ContractInvoiceExcelResponse {
-
+    @ExcelProperty("开票日期")
+    private String invoiceDate;
     @ExcelProperty("行政区")
     private String xzqmc;
     @ExcelProperty("开票单位")

+ 1 - 1
zjugis-business/src/main/resources/mapper/oracle/ContractInvoiceMapper.xml

@@ -186,7 +186,7 @@
     </select>
 
     <select id="excel" resultType="com.zjugis.business.bean.response.ContractInvoiceExcelResponse">
-        SELECT C.NAME as invoiceCompany,U.NICKNAME AS XSRY,D.NAME as ZRBM,T3.FULL_NAME as xmlb,A.FULL_NAME as xzqmc,T2.XMBH,T2.XMMC,T1.CONTRACT_NUMBER,T1.NAME,T.PAY_COMPANY,T.INVOICE_CONTENT,T.INVOICE_AMOUNT,(COALESCE(T.INVOICE_AMOUNT,0) - COALESCE(T5.returnAmount,0)) as unreturnAmount ,T.APPLY_WORKER_NAME,T.PAY_TAX_NUMBER,T.INVOICE_BZ,T.RECEIVE_BANKACCOUNT,T.ELE_INV_RECEIVE_PHONE,T.ELE_INV_RECEIVE_EMAIL,T.CUSTOMER_NAME
+        SELECT to_char(INVOICE_DATE,'YYYY-MM-DD') AS invoiceDate,C.NAME as invoiceCompany,U.NICKNAME AS XSRY,D.NAME as ZRBM,T3.FULL_NAME as xmlb,A.FULL_NAME as xzqmc,T2.XMBH,T2.XMMC,T1.CONTRACT_NUMBER,T1.NAME,T.PAY_COMPANY,T.INVOICE_CONTENT,T.INVOICE_AMOUNT,(COALESCE(T.INVOICE_AMOUNT,0) - COALESCE(T5.returnAmount,0)) as unreturnAmount ,T.APPLY_WORKER_NAME,T.PAY_TAX_NUMBER,T.INVOICE_BZ,T.RECEIVE_BANKACCOUNT,T.ELE_INV_RECEIVE_PHONE,T.ELE_INV_RECEIVE_EMAIL,T.CUSTOMER_NAME
         FROM CONTRACT_INVOICE T
         LEFT JOIN CONTRACT T1 ON T1.ID=T.CONTRACT_ID
         LEFT JOIN PROJECT T2 ON T2.ID=T.PROJECT_ID