Browse Source

增加字段,调整接口

zjc 11 months ago
parent
commit
b8eee2741e

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectApprovalController.java

@@ -123,7 +123,7 @@ public class TProjectApprovalController extends BaseController
         if(StringUtils.isNotEmpty(tProjectApproval.getParticipantsId())){
             StringUtils.str2List(tProjectApproval.getParticipantsId(),",",true,true).stream().forEach(str -> {
                 SysUser user = sysUserService.selectUserById(Long.valueOf(str));
-                String contents = "您好,"+user.getNickName()+"," + tProjectApproval.getProjectName() + "项目已发起立项申请。";
+                String contents = "您好,"+user.getNickName()+"," + tProjectApproval.getProjectName() + "已发起立项申请。";
                 try {
                     SmsSenderUtils.sendSms(user.getPhonenumber(),contents);
                 } catch (IOException e) {

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectDecisionController.java

@@ -123,7 +123,7 @@ public class TProjectDecisionController extends BaseController
         if(StringUtils.isNotEmpty(tProjectDecision.getParticipantsId())){
             StringUtils.str2List(tProjectDecision.getParticipantsId(),",",true,true).stream().forEach(str -> {
                 SysUser user = sysUserService.selectUserById(Long.valueOf(str));
-                String contents = "您好,"+user.getNickName()+"," + tProjectDecision.getProjectName() + "项目已发起投决申请。";
+                String contents = "您好,"+user.getNickName()+"," + tProjectDecision.getProjectName() + "已发起投决申请。";
                 try {
                     SmsSenderUtils.sendSms(user.getPhonenumber(),contents);
                 } catch (IOException e) {

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInvestigateController.java

@@ -134,7 +134,7 @@ public class TProjectInvestigateController extends BaseController
         if(StringUtils.isNotEmpty(tProjectInvestigate.getInvestigatePersonId())){
             StringUtils.str2List(tProjectInvestigate.getInvestigatePersonId(),",",true,true).stream().forEach(str -> {
                 SysUser user = sysUserService.selectUserById(Long.valueOf(str));
-                String contents = "您好,"+user.getNickName()+"," + tProjectInvestigate.getProjectName() + "项目已开启尽职背调。";
+                String contents = "您好,"+user.getNickName()+"," + tProjectInvestigate.getProjectName() + "已开启尽职背调。";
                 try {
                     SmsSenderUtils.sendSms(user.getPhonenumber(),contents);
                 } catch (IOException e) {

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -161,8 +161,8 @@ public class TProjectMeetingController extends BaseController
                 StringUtils.str2List(tProjectMeeting.getParticipantsId(),",",true,true).stream().forEach(str -> {
                     SysUser user = sysUserService.selectUserById(Long.valueOf(str));
                     String contents = "您好," + user.getNickName() + ",兹定于 " +
-                            tProjectMeeting.getStartTime() + "时间  " + tProjectMeeting.getEndTime() +
-                            "时间 在" + tProjectMeeting.getPlace() + "会议室召开" + tProjectMeeting.getMeetingTheme() + "会议,请提前做好准备按时参加。";
+                            DateUtils.parseDateToStr("yyyy/MM/dd HH:mm",tProjectMeeting.getStartTime()) + "至" + DateUtils.parseDateToStr("yyyy/MM/dd HH:mm",tProjectMeeting.getEndTime()) +
+                            "在" + tProjectMeeting.getPlace() + "召开" + tProjectMeeting.getMeetingTheme() + "会议,请提前做好准备按时参加。";
                     try {
                         SmsSenderUtils.sendSms(user.getPhonenumber(),contents);
                     } catch (IOException e) {
@@ -175,8 +175,8 @@ public class TProjectMeetingController extends BaseController
             if(StringUtils.isNotEmpty(tProjectMeeting.getPromoterId())){
                 SysUser user = sysUserService.selectUserById(Long.valueOf(tProjectMeeting.getPromoterId()));
                 String contents = "您好," + user.getNickName() + ",兹定于 " +
-                        tProjectMeeting.getStartTime() + "时间  " + tProjectMeeting.getEndTime() +
-                        "时间 在" + tProjectMeeting.getPlace() + "会议室召开" + tProjectMeeting.getMeetingTheme() + "会议,请提前做好准备按时参加。";
+                        DateUtils.parseDateToStr("yyyy/MM/dd HH:mm",tProjectMeeting.getStartTime()) + "至" + DateUtils.parseDateToStr("yyyy/MM/dd HH:mm",tProjectMeeting.getEndTime()) +
+                        "在" + tProjectMeeting.getPlace() + "召开" + tProjectMeeting.getMeetingTheme() + "会议,请提前做好准备按时参加。";
                 try {
                     SmsSenderUtils.sendSms(user.getPhonenumber(),contents);
                 } catch (IOException e) {

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -72,7 +72,7 @@ spring:
     # 地址
     host: localhost
     # 端口,默认为6379
-    port: 6379
+    port: 6380
     # 数据库索引
     database: 0
     # 密码