瀏覽代碼

//OfflineActivity

release_toaliyun_real
xiaohu 1 年之前
父節點
當前提交
4d75e95880
共有 2 個檔案被更改,包括 6 行新增6 行删除
  1. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantSettlementServiceImpl.java

+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java 查看文件

@@ -691,10 +691,10 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
headList.add(entity15); headList.add(entity15);
ExcelExportEntity entity16 = new ExcelExportEntity("周年庆抽奖编码","anniversaryLotteryNum",20); ExcelExportEntity entity16 = new ExcelExportEntity("周年庆抽奖编码","anniversaryLotteryNum",20);
headList.add(entity16); 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); headList.add(entity17);




+ 2
- 2
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){ private String getPercentage(BigDecimal yes, BigDecimal yesYes){


String percentage = "--"; String percentage = "--";
if(yes.compareTo(BigDecimal.ZERO) > 0){
if(yesYes.compareTo(BigDecimal.ZERO) > 0){
BigDecimal count = yes.subtract(yesYes); BigDecimal count = yes.subtract(yesYes);
percentage = count.divide(yesYes,2,BigDecimal.ROUND_HALF_UP).toString(); percentage = count.divide(yesYes,2,BigDecimal.ROUND_HALF_UP).toString();
} }
@@ -192,7 +192,7 @@ public class WxOfflineActivityGrantSettlementServiceImpl implements WxOfflineAct
nf.setMinimumFractionDigits(2); nf.setMinimumFractionDigits(2);


String percentage = "--"; String percentage = "--";
if(yes > 0){
if(yesYes > 0){
Integer count = yes - yesYes; Integer count = yes - yesYes;
percentage = nf.format(count.doubleValue() / new Double(yesYes).doubleValue()); percentage = nf.format(count.doubleValue() / new Double(yesYes).doubleValue());
} }


Loading…
取消
儲存