111

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/SyCarryServiceImpl.java

@@ -243,7 +243,7 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 							if(StringUtils.isNotBlank(q) && q.equals("T0114")){
 								continue;
 							}
-							iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),q,"搬运工对账单","您有一个新的搬运工对账单需要签字，请查看: "+syCarry.getName(), CommonConstant.MSG_CATEGORY_2,taskParam);
+							iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),q,"搬运工对账单签字提醒","您有一个新的搬运工对账单需要签字，请查看: "+syCarry.getName(), CommonConstant.MSG_CATEGORY_2,taskParam);
 
 						}
 
@@ -328,7 +328,7 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 					syCarry.setRoleText(sysRole.getRoleName());
 
 					for(SysUser o:userIds){
-						iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),o.getUsername(),"搬运工对账单","您有一个新的搬运工对账单需要审批，请查看: "+syCarry.getName(), CommonConstant.MSG_CATEGORY_2,taskParam);
+						iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),o.getUsername(),"搬运工对账单审批提醒","您有一个新的搬运工对账单需要审批，请查看: "+syCarry.getName(), CommonConstant.MSG_CATEGORY_2,taskParam);
 					}
 
 				}
@@ -432,7 +432,7 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 					syCarry.setRoleText(sysRole.getRoleName());
 					List<SysUser> userIds = sysUserService.getUserByRoleCode(roleCode,null);
 					for(SysUser o:userIds){
-						iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),o.getUsername(),"搬运工对账单","您有一个新的搬运工对账单需要审批，请查看: "+syCarry.getName(), CommonConstant.MSG_CATEGORY_2,taskParam);
+						iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),o.getUsername(),"搬运工对账单审批提醒","您有一个新的搬运工对账单需要审批，请查看: "+syCarry.getName(), CommonConstant.MSG_CATEGORY_2,taskParam);
 					}
 				}
 
@@ -671,7 +671,7 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 		syCarry.setRsxzTime(null);//人事行政提交人提交时间
 		this.updateById(syCarry);
 		HashMap<String,Object> taskParam = new HashMap<>();
-		iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),syCarry.getCreateBy(),"搬运工对账单",
+		iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),syCarry.getCreateBy(),"搬运工对账单驳回提醒",
 				"您发起的搬运工对账单: "+syCarry.getName()+"，被"+loginUser.getPostName()+"驳回，请查看",
 				CommonConstant.MSG_CATEGORY_2,taskParam);
 
@@ -892,7 +892,7 @@ public class SyCarryServiceImpl extends ServiceImpl<SyCarryMapper, SyCarry> impl
 
 //			List<SysUser> getUserByRoleCode = sysUserService.getUserByRoleCode("SY003",null);
 			for(SysUser o:userIds){
-				iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),o.getUsername(),"搬运工对账单","您有一个新的搬运工对账单需要审批，请查看: "+syCarry.getName(), CommonConstant.MSG_CATEGORY_2,taskParam);
+				iSysBaseAPI.sendSysAnnouncement(loginUser,loginUser.getUsername(),o.getUsername(),"搬运工对账单审批提醒","您有一个新的搬运工对账单需要审批，请查看: "+syCarry.getName(), CommonConstant.MSG_CATEGORY_2,taskParam);
 			}