修改零星支付

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SporadicChargeInfo.java

@@ -53,6 +53,10 @@ public class SporadicChargeInfo {
 	@ApiModelProperty(value = "是否删除", required = true)
 	private Integer delFlag;
 
+	private String openFlagStr;
+
+	private String orderType;
+
 	public Integer getOpenFlag() {
 		return openFlag;
 	}
@@ -188,4 +192,20 @@ public class SporadicChargeInfo {
 	public void setDiscountAmount(BigDecimal discountAmount) {
 		this.discountAmount = discountAmount;
 	}
+
+	public String getOpenFlagStr() {
+		return openFlagStr;
+	}
+
+	public void setOpenFlagStr(String openFlagStr) {
+		this.openFlagStr = openFlagStr;
+	}
+
+	public String getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(String orderType) {
+		this.orderType = orderType;
+	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -596,10 +596,14 @@ public class ExportController extends BaseController {
             }
         }
         List<SporadicChargeInfo> rows = sporadicChargeInfoService.queryDetailPage(queryInfo).getRows();
+        for (SporadicChargeInfo row : rows) {
+            row.setOpenFlagStr(row.getOpenFlag().equals(0) ? "开启" : "关闭");
+            row.setOrderType(row.getUserId() !=null ? "公用" : "个人");
+        }
         OutputStream outputStream = response.getOutputStream();
         try {
-            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "收费类型", "标题", "金额", "时间", "学生姓名", "创建人"}, new String[]{
-                    "organName", "chargeType.msg", "title", "amount", "updateTime", "userName", "operatorName"}, rows);
+            HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部", "收费类型", "标题", "收费状态", "金额", "时间", "学生姓名","订单类型", "创建人"}, new String[]{
+                    "organName", "chargeType.msg", "title", "openFlagStr", "amount", "updateTime", "userName", "orderType","operatorName"}, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
             response.flushBuffer();
@@ -1945,9 +1949,9 @@ public class ExportController extends BaseController {
         }
 
         try {
-            String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "应付金额", "现金支付", "余额支付","分润账户","分润金额","分润余额","到账时间",
+            String[] header = {"序号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "应付金额", "现金支付", "余额支付", "分润账户", "分润金额", "分润余额", "到账时间",
                     "关联乐团ID/VIP课ID", "课程形态", "课程费用", "减免费用", "押金", "乐器", "教辅费用", "零星收款费用", "零星收款类别", "手续费", "专业", "分部", "单位/学校", "合作机构", "备注"};
-            String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "expectAmount", "actualAmount", "balancePaymentAmount","routeMerNo","routeAmount","routeBalance", "payTime", "musicGroupId",
+            String[] body = {"id", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance", "payTime", "musicGroupId",
                     "groupType.desc", "courseFee", "remitFee", "leaseFee", "musicalFee", "teachingFee", "sporadicAmount", "sporadicType", "transferFee", "subjectName", "organName", "schoolName", "cooperationOrganName", "memo"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
             response.setContentType("application/octet-stream");