警情结案短信模板修改

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertSubmittedObject.java

@@ -41,8 +41,9 @@ public class AlertSubmittedObject extends BaseEntity {
     @ApiModelProperty(value = "人员id")
     private Long userId;
 
+    @TableField("user_name")
     @ApiModelProperty(value = "人员名称")
-    private String userName;
+    private String  theUser;
 
     @ApiModelProperty(value = "人员电话")
     private String userPhone;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

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