【pc端 -新增用户指标展示管理】【定时任务接口修改】魏凯 2020-11-25

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/UserAnalysisNoteServiceImpl.java

@@ -229,6 +229,7 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl<UserAnalysisNot
               Integer ranking = streeRanking.get(dto.getDeptId());
               //组装短信内容参数
                LinkedHashMap<String, String>  noteParams = streeNoteContent(ranking,dto);
+               noteParams.put("deptType","街道");
                contentNote.put(mobile,noteParams);
            }else {//社区级账号 发送街道模板
                //获取电话号
@@ -238,6 +239,7 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl<UserAnalysisNot
                Integer rankingCommunity = communiytRanking.get(dto.getDeptId());
                //组装短信内容参数
                LinkedHashMap<String, String>  noteParams = streeNoteContent(rankingCommunity,dto);
+               noteParams.put("deptType","社区");
                contentNote.put(mobile,noteParams);
            }
         }
@@ -324,7 +326,6 @@ public class UserAnalysisNoteServiceImpl extends BaseServiceImpl<UserAnalysisNot
     private  LinkedHashMap<String, String> streeNoteContent(Integer ranking,UserAnalysisNoteDTO dto){
         LinkedHashMap<String, String> noteParams = new LinkedHashMap<>();
         noteParams.put("deptName",dto.getDeptName());
-        noteParams.put("deptType","街道");
         noteParams.put("month",getLastMonth());
         noteParams.put("sort",ranking.toString());
         noteParams.put("code",dto.getDeptId());

esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/java/com/elink/esua/epdc/service/impl/SmsTemplateServiceImpl.java

@@ -182,12 +182,8 @@ public class SmsTemplateServiceImpl extends BaseServiceImpl<SmsTemplateDao, SmsT
         if (null == templateDto) {
             return new Result().error("未查询到模板信息");
         }
-
-        // 手机号处理
-        List<String> mobiles = this.mobileHandle(formDto.getMobiles());
-
         // 发送短信通知
-        this.sendNoticeNew(mobiles, templateDto,formDto);
+        this.sendNoticeNew(formDto.getMobiles(), templateDto,formDto);
 
         return new Result();
     }