anderx пре 1 година
родитељ
комит
2fd156591a

+ 8 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -267,7 +267,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		String format = String.format("%s准备公出%s(%s)," +
 						"总计公出:%s人,%s次,%s时。本合同%s,本次公出申请,%s。超出公出时长,将计入您的第三方成本," +
 						"从奖金计算基数中扣除!请确认是否同意本次公出?", my.getName(), data.getUserName(), data.getContractNo(),
-				data.getPeopleCount(), data.getTimesCount(), data.getDurationCount().stripTrailingZeros(), amountName,
+				data.getPeopleCount(), data.getTimesCount(), data.getDurationCount().stripTrailingZeros().toPlainString(), amountName,
 				amountType);
 		return format;
 	}
@@ -1740,4 +1740,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 
 
+	public static void main(String[] args) {
+		Double d = Double.valueOf("15.5");
+		BigDecimal count = BigDecimal.ZERO;
+		count=count.add(BigDecimal.valueOf(d));
+		count=count.add(BigDecimal.valueOf(15));
+		System.out.println(count);
+	}
 }