diff --git a/.idea/libraries/Maven__cglib_cglib_3_1.xml b/.idea/libraries/Maven__cglib_cglib_3_1.xml
new file mode 100644
index 000000000..bd3cddd6b
--- /dev/null
+++ b/.idea/libraries/Maven__cglib_cglib_3_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml b/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml
new file mode 100644
index 000000000..a74963b4c
--- /dev/null
+++ b/.idea/libraries/Maven__com_alibaba_easyexcel_2_2_7.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml
new file mode 100644
index 000000000..2db743118
--- /dev/null
+++ b/.idea/libraries/Maven__com_github_virtuald_curvesapi_1_04.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml
new file mode 100644
index 000000000..1e0b53d1f
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml
new file mode 100644
index 000000000..49cd123ce
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_commons_commons_compress_1_21.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml
new file mode 100644
index 000000000..1a446fbf1
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_3_17.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml
new file mode 100644
index 000000000..d50f385ea
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_3_17.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
new file mode 100644
index 000000000..d214d8b81
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_poi_poi_ooxml_schemas_3_17.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
new file mode 100644
index 000000000..cb0f76d6c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_xmlbeans_xmlbeans_2_6_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml b/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml
new file mode 100644
index 000000000..9ccdf70d9
--- /dev/null
+++ b/.idea/libraries/Maven__org_ehcache_ehcache_3_9_9.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml b/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml
new file mode 100644
index 000000000..b5e374897
--- /dev/null
+++ b/.idea/libraries/Maven__org_ow2_asm_asm_4_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz-web/emis-biz-web.iml b/emis-biz-web/emis-biz-web.iml
index c5cd89ef1..5b3cf1c18 100644
--- a/emis-biz-web/emis-biz-web.iml
+++ b/emis-biz-web/emis-biz-web.iml
@@ -112,15 +112,6 @@
-
-
-
-
-
-
-
-
-
@@ -160,7 +151,6 @@
-
@@ -266,5 +256,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
index 73c8c0ba6..45a593497 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java
@@ -11,13 +11,16 @@
package com.xdadan.erp.web.emis;
+import java.io.IOException;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.domain.EmisSettleSubBill;
+import com.xdadan.erp.emis.domain.EmisSettleSubBillFeeitem;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.emis.service.billexport.ExcelUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
@@ -189,6 +192,27 @@ public class EmisSettleBillController extends BaseController
}
+ @Log(title = "导出账单", businessType = BusinessType.EXPORT)
+ @GetMapping(value = "/exportBill")
+ public void exportBill(HttpServletResponse response,String settleBillNo)
+ {
+// return AjaxResult.success();
+
+ EmisSettleBill bill=emisBaseService.getSettleBillBySettleBillNo(settleBillNo);
+ List list = emisBaseService.selectSubBillListBySettleBillNo(settleBillNo);
+
+ ExcelUtil util = new ExcelUtil(EmisSettleSubBill.class);
+// util.exportExcel(response, list, "账单明细数据");
+ try {
+ ExcelUtils.exportToTemplate(response, "tpl/settle_bill_tpl.xls", bill.getSettleBillName()+".xls", null,
+ null, null,
+ null);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
/**
* 修改结算总账单
diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml
index a33e6214c..162fa7f70 100644
--- a/emis-biz/emis-biz.iml
+++ b/emis-biz/emis-biz.iml
@@ -65,15 +65,6 @@
-
-
-
-
-
-
-
-
-
@@ -85,7 +76,6 @@
-
@@ -115,7 +105,6 @@
-
@@ -137,6 +126,7 @@
+
@@ -225,5 +215,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index 66d62d4ce..739d48f56 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -105,6 +105,26 @@
1.1.14
+
+
+
+ com.alibaba
+ easyexcel
+ 2.2.7
+
+
+
+
+ org.apache.poi
+ poi
+ 3.17
+
+
+ org.apache.poi
+ poi-ooxml
+ 3.17
+
+
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 3e82011f7..81b295332 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -1305,6 +1305,11 @@ public class EmisBaseService {
return emisSettleSubBillMapper.setBillErrorBySite(emisSettleSubBill);
}
+
+ public List selectSubBillListBySettleBillNo(String settleBillNo){
+ return emisSettleSubBillMapper.selectSubBillListBySettleBillNo(settleBillNo);
+ }
+
/**
* 根据账单号获取总账单
* @param settleBillNo
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/DynamicDataMapping.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/DynamicDataMapping.java
new file mode 100644
index 000000000..71c5cea11
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/DynamicDataMapping.java
@@ -0,0 +1,50 @@
+package com.xdadan.erp.emis.service.billexport;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class DynamicDataMapping {
+
+ private String dataId;
+ private List