Commit 599bbaac authored by tangwei's avatar tangwei

Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

parents 5c4150ae d367acda
......@@ -102,7 +102,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
// 获取任务派发模板
Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
alertCalled.getAlertType()));
alertCalled.getAlertType()).eq("format", false));
String content = template.getContent();
Map<String, String> definitions = new HashMap<>();
initDefinitions(definitions, alertCalled, powerTransferDto);
......
......@@ -59,6 +59,7 @@ public class BeanDtoVoUtils {
if (source == null) {
return null;
}
try {
// 创建新的对象实例
FireExpertsDto target = FireExpertsDto.class.newInstance();
......@@ -112,6 +113,9 @@ public class BeanDtoVoUtils {
//由出生日期获得年龄
public static int getAge(Date birthDay) {
if(birthDay == null){
return 0;
}
Calendar cal = Calendar.getInstance();
if (cal.before(birthDay)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment