diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index a2da9a647..abcccf83f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -130,6 +130,7 @@ public class WxMerchantSubsidyController extends BaseController { wxMerchantSubsidy.setStatusS(tmpList); } } + wxMerchantSubsidy.setSortColumns(WxMerchantSubsidy.Field.CreateDate_DESC); wxMerchantSubsidyService.exportData(wxMerchantSubsidy, request, response); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index f271faa04..2121d71bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -25,6 +25,7 @@ import com.iformall.common.IdWorker; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; +import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.List; import java.util.Map; @@ -94,7 +95,8 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { String filename = UUID.randomUUID() + ".xlsx"; filepath = filepath + filename; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + DecimalFormat df = new DecimalFormat("0.00"); try { File file = new File(filepath); @@ -129,13 +131,16 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { WxMerchantSubsidyVo entity = subsidyVoList.get(i); - idCellTwo.setCellValue(entity.getId()); + idCellTwo.setCellValue(String.valueOf(entity.getId())); merchantNameCellTwo.setCellValue(entity.getMerchantName()); if (entity.getCreateDate() != null) createDateCellTwo.setCellValue(sdf.format(entity.getCreateDate())); - orderPaymentCellTwo.setCellValue(entity.getOrderPayment()/ 100); - receiverPaymentCellTwo.setCellValue(entity.getReceiverPayment() / 100); - subsidyCellTwo.setCellValue(entity.getSubsidy() / 100); + String dStr = df.format((float)entity.getOrderPayment()/100); + orderPaymentCellTwo.setCellValue(dStr); + dStr = df.format((float)entity.getReceiverPayment()/100); + receiverPaymentCellTwo.setCellValue(dStr); + dStr = df.format((float)entity.getSubsidy()/100); + subsidyCellTwo.setCellValue(dStr); String statusStr = "未补贴"; if (entity.getStatus().equals(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode())) { statusStr = "未补贴";