feature:格式

src/main/java/com/ywt/mg/services/CheckUpOrderService.java

@@ -250,6 +250,8 @@ public class CheckUpOrderService {
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 1, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 1, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        startRows++;
+
         PaymentChannelEnum[] paymentChannelList = PaymentChannelEnum.values();
         if (!Checker.isNone(paymentChannelList)) {
             for (int i = 0, j = paymentChannelList.length; i < j; i++) {
@@ -263,9 +265,9 @@ public class CheckUpOrderService {
                 int refundValue = statisticalDataMap.getOrDefault(refundKey, 0);
                 if (payValue > 0 || refundValue > 0) {
                     startRows += 1;
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 2, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 5, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows , new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
                 }
             }
         }

src/main/java/com/ywt/mg/services/NatOrderService.java

@@ -181,7 +181,7 @@ public class NatOrderService {
             String col1 = "订单号", col1_1 = "支付流水号", col1_1_1 = "交易流水号", col1_1_2 = "支付渠道", col2 = "医院", col3 = "患者姓名", col4 = "身份证号", col5 = "年龄", col6 = "性别", col7 = "手机号";
             String col8 = "缴费码", col9 = "疫苗码", col10 = "金额", col11 = "支付状态", col12 = "订单状态";
             String col13 = "支付时间", col14 = "退费时间", col15 = "预约时间", col16 = "执行时间", col17 = "备注";
-            String[] columns = new String[]{col1, col1_1, col1_1_1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15, col16, col17};
+            String[] columns = new String[]{col1, col1_1, col1_1_1, col1_1_2, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15, col16, col17};
             ExcelDataMap map = new ExcelDataMap(columns);
             List<NatOrder> list = queryNatOrderList(request);
             int payTotal = 0, refundTotal = 0, realityTotal = 0;
@@ -260,6 +260,7 @@ public class NatOrderService {
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 1, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 1, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
         PaymentChannelEnum[] paymentChannelList = PaymentChannelEnum.values();
+        startRows++;
         if (!Checker.isNone(paymentChannelList)) {
             for (int i = 0, j = paymentChannelList.length; i < j; i++) {
                 int paymentChannel = paymentChannelList[i].getValue();
@@ -272,9 +273,9 @@ public class NatOrderService {
                 int refundValue = statisticalDataMap.getOrDefault(refundKey, 0);
                 if (payValue > 0 || refundValue > 0) {
                     startRows += 1;
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 2, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 5, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
                 }
             }
         }

src/main/java/com/ywt/mg/services/OfflineNewService.java

@@ -379,9 +379,11 @@ public class OfflineNewService {
         int startColumn = 3;
 
         List<ExcelCollectPojo> customExcelItemList = new ArrayList<>();
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 2, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
-        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 3, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows+ 1, new String[]{"支付总额", FormatUtil.intShrink100ToStr(payTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows+ 1, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
+        customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows+ 1, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
+        startRows++;
+
         PaymentChannelEnum[] paymentChannelList = PaymentChannelEnum.values();
         if (!Checker.isNone(paymentChannelList)) {
             for (int i = 0, j = paymentChannelList.length; i < j; i++) {
@@ -395,9 +397,9 @@ public class OfflineNewService {
                 int refundValue = statisticalDataMap.getOrDefault(refundKey, 0);
                 if (payValue > 0 || refundValue > 0) {
                     startRows += 1;
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 2, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 5, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
                 }
             }
         }

src/main/java/com/ywt/mg/services/OutpatientOrderService.java

@@ -457,6 +457,8 @@ public class OutpatientOrderService {
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 1, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 1, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
         PaymentChannelEnum[] paymentChannelList = PaymentChannelEnum.values();
+        startRows++;
+
         if (!Checker.isNone(paymentChannelList)) {
             for (int i = 0, j = paymentChannelList.length; i < j; i++) {
                 int paymentChannel = paymentChannelList[i].getValue();

src/main/java/com/ywt/mg/services/PrescriptionServices.java

@@ -531,6 +531,7 @@ public class PrescriptionServices {
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 1, new String[]{"退款总额", FormatUtil.intShrink100ToStr(refundTotal)}));
         customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 1, new String[]{"实际支付总额", FormatUtil.intShrink100ToStr(payTotal - refundTotal)}));
         PaymentChannelEnum[] paymentChannelList = PaymentChannelEnum.values();
+        startRows++;
         if (!Checker.isNone(paymentChannelList)) {
             for (int i = 0, j = paymentChannelList.length; i < j; i++) {
                 int paymentChannel = paymentChannelList[i].getValue();
@@ -543,9 +544,9 @@ public class PrescriptionServices {
                 int refundValue = statisticalDataMap.getOrDefault(refundKey, 0);
                 if (payValue > 0 || refundValue > 0) {
                     startRows += 1;
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows + 1, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows + 2, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
-                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows + 5, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 1, startRows, new String[]{paymentChannelName + "支付总额", FormatUtil.intShrink100ToStr(payValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 3, startRows, new String[]{paymentChannelName + "退款总额", FormatUtil.intShrink100ToStr(refundValue)}));
+                    customExcelItemList.add(new ExcelCollectPojo(startColumn + 5, startRows, new String[]{paymentChannelName + "实际支付总额", FormatUtil.intShrink100ToStr(payValue - refundValue)}));
                 }
             }
         }