fix(settle ui): up update, email template update

master
yixian 5 years ago
parent 4fdbd23058
commit 1522b5fd15

@ -1156,7 +1156,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
Context ctx = new Context();
ctx.setVariable("date", DateFormatUtils.format(date, "dd-MM-yyyy"));
ctx.setVariable("abaFiles", abaFileList);
ctx.setVariable("totalAmount", abaFileList.stream().map(ABAFile::getTotalSettleAmount).reduce(BigDecimal::add));
BigDecimal total = abaFileList.stream().map(ABAFile::getTotalSettleAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
ctx.setVariable("totalAmount", total.setScale(2, RoundingMode.DOWN).toPlainString());
final String content = thymeleaf.process("mail/settlement_mail", ctx);
// 测试用地址
// String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content,

@ -3,6 +3,7 @@
</div>
<div class="modal-body" style="height: 300px">
<div class="text-center" >
<div class="row">
<div class="col-sm-12">
<ul class="list-group">
<li class="list-group-item text-left" ng-repeat="log in settleLogs" ng-class="{'active':log.send}" ng-click="switchSendFlag(log)">
@ -11,19 +12,26 @@
</li>
</ul>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<label class="checkbox-inline">
<input type="checkbox" name="mark_sent" ng-model="config.mark_sent" class="checkbox">
同时标记为已发送
</label>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<button type="button" class="btn btn-primary" style="width: 100%; margin-top: 30px" data-dismiss="modal"
ng-click="sendSettlementMail()" ng-disabled="sendMailButton">发送清算邮件
</button>
</div>
</div>
<div class="row">
<div class="error">
<span ng-bind="error_msg"></span>
</div>
</div>
</div>
</div>
Loading…
Cancel
Save