Commit 99e8e9e9 authored by 李腾威's avatar 李腾威

警情结案短信模板修改

parent efde84c8
...@@ -41,8 +41,9 @@ public class AlertSubmittedObject extends BaseEntity { ...@@ -41,8 +41,9 @@ public class AlertSubmittedObject extends BaseEntity {
@ApiModelProperty(value = "人员id") @ApiModelProperty(value = "人员id")
private Long userId; private Long userId;
@TableField("user_name")
@ApiModelProperty(value = "人员名称") @ApiModelProperty(value = "人员名称")
private String userName; private String theUser;
@ApiModelProperty(value = "人员电话") @ApiModelProperty(value = "人员电话")
private String userPhone; private String userPhone;
......
...@@ -515,7 +515,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -515,7 +515,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmittedObject.setType(false); alertSubmittedObject.setType(false);
alertSubmittedObject.setUserId(Long.valueOf(String.valueOf(orgUser.get("sequenceNbr")))); alertSubmittedObject.setUserId(Long.valueOf(String.valueOf(orgUser.get("sequenceNbr"))));
alertSubmittedObject.setUserName((String) orgUser.get("bizOrgName")); alertSubmittedObject.setTheUser((String) orgUser.get("bizOrgName"));
alertSubmittedObject.setCompanyName((String) orgUser.get("companyName")); alertSubmittedObject.setCompanyName((String) orgUser.get("companyName"));
if (!ValidationUtil.isEmpty(orgUser.get("telephone"))) { if (!ValidationUtil.isEmpty(orgUser.get("telephone"))) {
...@@ -658,7 +658,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -658,7 +658,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmittedObject.setCompanyName(company.getCompanyName()); alertSubmittedObject.setCompanyName(company.getCompanyName());
alertSubmittedObject.setUserId(person.getPersonId()); alertSubmittedObject.setUserId(person.getPersonId());
userIds.add(person.getPersonId()); userIds.add(person.getPersonId());
alertSubmittedObject.setUserName(person.getPersonName()); alertSubmittedObject.setTheUser(person.getPersonName());
alertSubmittedObject.setUserPhone(person.getPersonPhone()); alertSubmittedObject.setUserPhone(person.getPersonPhone());
alertSubmittedObject.setRecUserName(userName); alertSubmittedObject.setRecUserName(userName);
if (!ValidationUtil.isEmpty(person.getPersonPhone())) { if (!ValidationUtil.isEmpty(person.getPersonPhone())) {
...@@ -686,7 +686,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -686,7 +686,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
map.put("usIds", ""); map.put("usIds", "");
} }
alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList); // alertSubmittedObjectServiceImpl.saveBatch(alertSubmittedObjectList);
for(AlertSubmittedObject object :alertSubmittedObjectList ) {
alertSubmittedObjectServiceImpl.save(object);
}
// 3.更新警情状态 // 3.更新警情状态
alertCalledService.updateAlertCalled(alertSubmittedDto.getAlertCalledId(), alertCalledService.updateAlertCalled(alertSubmittedDto.getAlertCalledId(),
...@@ -1442,7 +1445,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -1442,7 +1445,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmittedObject.setCompanyName(companyName); alertSubmittedObject.setCompanyName(companyName);
alertSubmittedObject.setType(false); alertSubmittedObject.setType(false);
alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString())); alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString()));
alertSubmittedObject.setUserName(orgUser.get("userName").toString()); alertSubmittedObject.setTheUser(orgUser.get("userName").toString());
// 将发送人放入 list // 将发送人放入 list
pList.add(orgUser.get("userName").toString()); pList.add(orgUser.get("userName").toString());
...@@ -1489,7 +1492,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -1489,7 +1492,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
continue; continue;
} }
alertSubmittedObjectSub.setUserId(Long.parseLong(map.get("userId").toString())); alertSubmittedObjectSub.setUserId(Long.parseLong(map.get("userId").toString()));
alertSubmittedObjectSub.setUserName(map.get("userName").toString()); alertSubmittedObjectSub.setTheUser(map.get("userName").toString());
// //
pList.add(map.get("userName").toString()); pList.add(map.get("userName").toString());
Set<String> mobile =null; Set<String> mobile =null;
...@@ -1617,7 +1620,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -1617,7 +1620,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmittedObject.setCompanyName(companyName); alertSubmittedObject.setCompanyName(companyName);
alertSubmittedObject.setType(false); alertSubmittedObject.setType(false);
alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString())); alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString()));
alertSubmittedObject.setUserName(orgUser.get("userName").toString()); alertSubmittedObject.setTheUser(orgUser.get("userName").toString());
pList.add(orgUser.get("userName").toString()); pList.add(orgUser.get("userName").toString());
if (!ValidationUtil.isEmpty(orgUser.get("telephone"))) { if (!ValidationUtil.isEmpty(orgUser.get("telephone"))) {
...@@ -1738,7 +1741,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -1738,7 +1741,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
alertSubmittedObject.setCompanyName(companyName); alertSubmittedObject.setCompanyName(companyName);
alertSubmittedObject.setType(false); alertSubmittedObject.setType(false);
alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString())); alertSubmittedObject.setUserId(Long.parseLong(orgUser.get("userId").toString()));
alertSubmittedObject.setUserName(orgUser.get("userName").toString()); alertSubmittedObject.setTheUser(orgUser.get("userName").toString());
pList.add(orgUser.get("userName").toString()); pList.add(orgUser.get("userName").toString());
if (!ValidationUtil.isEmpty(orgUser.get("mobilePhone"))) { if (!ValidationUtil.isEmpty(orgUser.get("mobilePhone"))) {
......
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