From 4d75e9588078d3c5b7acdff72753d7aef84e1bb7 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Thu, 15 Aug 2024 10:29:45 +0800 Subject: [PATCH] //OfflineActivity --- .../impl/WxOfflineActivityGrantAwardServiceImpl.java | 8 ++++---- .../impl/WxOfflineActivityGrantSettlementServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 7befddf3f..f794f5470 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -691,10 +691,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity headList.add(entity15); ExcelExportEntity entity16 = new ExcelExportEntity("周年庆抽奖编码","anniversaryLotteryNum",20); headList.add(entity16); - ExcelExportEntity entity17 = new ExcelExportEntity("签名图片","signImg",20); - entity17.setType(BaseEntityTypeConstants.IMAGE_TYPE); - entity17.setExportImageType(1); - entity17.setHeight(20); + ExcelExportEntity entity17 = new ExcelExportEntity("签名图片","signImg",40); +// entity17.setType(BaseEntityTypeConstants.IMAGE_TYPE); +// entity17.setExportImageType(1); +// entity17.setHeight(20); headList.add(entity17); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java index 9671d8546..1f2dacfa9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java @@ -180,7 +180,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct private String getPercentage(BigDecimal yes, BigDecimal yesYes){ String percentage = "--"; - if(yes.compareTo(BigDecimal.ZERO) > 0){ + if(yesYes.compareTo(BigDecimal.ZERO) > 0){ BigDecimal count = yes.subtract(yesYes); percentage = count.divide(yesYes,2,BigDecimal.ROUND_HALF_UP).toString(); } @@ -192,7 +192,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct nf.setMinimumFractionDigits(2); String percentage = "--"; - if(yes > 0){ + if(yesYes > 0){ Integer count = yes - yesYes; percentage = nf.format(count.doubleValue() / new Double(yesYes).doubleValue()); }