12713-【CR】【投资系统】 投资系统流程审批加提醒1

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/ApprovalServiceImpl.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sms.SmsSenderUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
@@ -29,9 +30,11 @@ import org.flowable.task.api.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.*;
 
 /**
@@ -515,24 +518,22 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
                             if (org.apache.commons.lang3.StringUtils.isNotBlank(assignee)) { // 给审批人发送短信
                                 SysUser auditUser = sysUserService.selectUserById(Long.valueOf(assignee));
                                 String auditContents = auditUser.getNickName() + ",您好。投资系统中" + projectApproval.getProjectName() + "的项目立项流程待处理";
-                                System.out.println(auditContents);
                                 if (auditUser != null && StringUtils.isNotBlank(auditUser.getPhonenumber())) {
-                                    /*try{
+                                    try{
                                         SmsSenderUtils.sendSms(auditUser.getPhonenumber(), auditContents);
                                     } catch (IOException e) {
                                         logger.error("短信发送失败"+e.getMessage());
-                                    }*/
+                                    }
                                 }
                             }
                         } else { // 审批人驳回，给申请人发短信
                             String rejectContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectApproval.getProjectName() + "的项目立项申请已审核，结果为【驳回】";
-                            System.out.println(rejectContents);
                             if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                                /*try{
-                                    SmsSenderUtils.sendSms(rejectUser.getPhonenumber(), rejectContents);
+                                try{
+                                    SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), rejectContents);
                                 } catch (IOException e) {
                                     logger.error("短信发送失败"+e.getMessage());
-                                }*/
+                                }
                             }
                         }
                     }
@@ -544,25 +545,23 @@ public class ApprovalServiceImpl extends FlowServiceFactory implements IApproval
                 // 审批完成，给申请人发短信
                 //XXX，您好。你在投资系统中提交“XXX”的项目立项申请已审核，结果为【通过】/【驳回】/【观望】！
                 completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectApproval.getProjectName() + "的项目立项申请已审核，结果为【同意】";
-                System.out.println(completeContents);
                 if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
+                    try{
+                        SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
                     } catch (IOException e) {
                         logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                    }
                 }
 
             }else{
                 if(StringUtils.isNotEmpty(result)){//代表是终止或者观望
                     completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectApproval.getProjectName() + "的项目立项申请已审核，结果为"+result;
-                    System.out.println(completeContents);
                     if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
-                    } catch (IOException e) {
-                        logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                        try{
+                            SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
+                        } catch (IOException e) {
+                            logger.error("短信发送失败"+e.getMessage());
+                        }
                     }
                 }
             }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/DecisionServiceImpl.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sms.SmsSenderUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
@@ -29,6 +30,7 @@ import org.flowable.task.api.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -471,24 +473,22 @@ public class DecisionServiceImpl extends FlowServiceFactory implements IDecision
                             if (org.apache.commons.lang3.StringUtils.isNotBlank(assignee)) { // 给审批人发送短信
                                 SysUser auditUser = sysUserService.selectUserById(Long.valueOf(assignee));
                                 String auditContents = auditUser.getNickName() + ",您好。投资系统中" + projectDecision.getProjectName() + "的项目投决流程待处理";
-                                System.out.println(auditContents);
                                 if (auditUser != null && StringUtils.isNotBlank(auditUser.getPhonenumber())) {
-                                    /*try{
+                                    try{
                                         SmsSenderUtils.sendSms(auditUser.getPhonenumber(), auditContents);
                                     } catch (IOException e) {
                                         logger.error("短信发送失败"+e.getMessage());
-                                    }*/
+                                    }
                                 }
                             }
                         } else { // 审批人驳回，给申请人发短信
                             String rejectContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectDecision.getProjectName() + "的项目投决申请已审核，结果为【驳回】";
-                            System.out.println(rejectContents);
                             if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                                /*try{
-                                    SmsSenderUtils.sendSms(rejectUser.getPhonenumber(), rejectContents);
+                                try{
+                                    SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), rejectContents);
                                 } catch (IOException e) {
                                     logger.error("短信发送失败"+e.getMessage());
-                                }*/
+                                }
                             }
                         }
                     }
@@ -500,25 +500,23 @@ public class DecisionServiceImpl extends FlowServiceFactory implements IDecision
                 // 审批完成，给申请人发短信
                 //XXX，您好。你在投资系统中提交“XXX”的项目投决申请已审核，结果为【通过】/【驳回】/【观望】！
                 completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectDecision.getProjectName() + "的项目投决申请已审核，结果为【同意】";
-                System.out.println(completeContents);
                 if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
+                    try{
+                        SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
                     } catch (IOException e) {
                         logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                    }
                 }
 
             }else{
                 if(StringUtils.isNotEmpty(result)){//代表是终止或者观望
                     completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectDecision.getProjectName() + "的项目投决申请已审核，结果为"+result;
-                    System.out.println(completeContents);
                     if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
-                    } catch (IOException e) {
-                        logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                        try{
+                            SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
+                        } catch (IOException e) {
+                            logger.error("短信发送失败"+e.getMessage());
+                        }
                     }
                 }
             }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/InvestigateServiceImpl.java

@@ -29,6 +29,7 @@ import org.flowable.task.api.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -438,24 +439,22 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
                             if (org.apache.commons.lang3.StringUtils.isNotBlank(assignee)) { // 给审批人发送短信
                                 SysUser auditUser = sysUserService.selectUserById(Long.valueOf(assignee));
                                 String auditContents = auditUser.getNickName() + ",您好。投资系统中" + projectInvestigate.getProjectName() + "的项目背调流程待处理";
-                                System.out.println(auditContents);
                                 if (auditUser != null && StringUtils.isNotBlank(auditUser.getPhonenumber())) {
-                                    /*try{
+                                    try{
                                         SmsSenderUtils.sendSms(auditUser.getPhonenumber(), auditContents);
                                     } catch (IOException e) {
                                         logger.error("短信发送失败"+e.getMessage());
-                                    }*/
+                                    }
                                 }
                             }
                         } else { // 审批人驳回，给申请人发短信
                             String rejectContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectInvestigate.getProjectName() + "的项目背调申请已审核，结果为【驳回】";
-                            System.out.println(rejectContents);
                             if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                                /*try{
-                                    SmsSenderUtils.sendSms(rejectUser.getPhonenumber(), rejectContents);
+                                try{
+                                    SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), rejectContents);
                                 } catch (IOException e) {
                                     logger.error("短信发送失败"+e.getMessage());
-                                }*/
+                                }
                             }
                         }
                     }
@@ -467,25 +466,23 @@ public class InvestigateServiceImpl extends FlowServiceFactory implements IInves
                 // 审批完成，给申请人发短信
                 //XXX，您好。你在投资系统中提交“XXX”的项目背调申请已审核，结果为【通过】/【驳回】/【观望】！
                 completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectInvestigate.getProjectName() + "的项目背调申请已审核，结果为【同意】";
-                System.out.println(completeContents);
                 if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
+                    try{
+                        SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
                     } catch (IOException e) {
                         logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                    }
                 }
 
             }else{
                 if(StringUtils.isNotEmpty(result)){//代表是终止或者观望
                     completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectInvestigate.getProjectName() + "的项目背调申请已审核，结果为"+result;
-                    System.out.println(completeContents);
                     if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
-                    } catch (IOException e) {
-                        logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                        try{
+                            SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
+                        } catch (IOException e) {
+                            logger.error("短信发送失败"+e.getMessage());
+                        }
                     }
                 }
             }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/InvestmentOpportunityServiceImpl.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.enums.FileType;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sms.SmsSenderUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
@@ -27,9 +28,11 @@ import org.flowable.task.api.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.*;
 
 /**
@@ -427,24 +430,22 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
                             if (org.apache.commons.lang3.StringUtils.isNotBlank(assignee)) { // 给审批人发送短信
                                 SysUser auditUser = sysUserService.selectUserById(Long.valueOf(assignee));
                                 String auditContents = auditUser.getNickName() + ",您好。投资系统中" + projectPool.getProjectName() + "的项目机会流程待处理";
-                                System.out.println(auditContents);
                                 if (auditUser != null && StringUtils.isNotBlank(auditUser.getPhonenumber())) {
-                                    /*try{
+                                    try{
                                         SmsSenderUtils.sendSms(auditUser.getPhonenumber(), auditContents);
                                     } catch (IOException e) {
                                         logger.error("短信发送失败"+e.getMessage());
-                                    }*/
+                                    }
                                 }
                             }
                         } else { // 审批人驳回，给申请人发短信
                             String rejectContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectPool.getProjectName() + "的项目机会申请已审核，结果为【驳回】";
-                            System.out.println(rejectContents);
                             if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                                /*try{
-                                    SmsSenderUtils.sendSms(rejectUser.getPhonenumber(), rejectContents);
+                                try{
+                                    SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), rejectContents);
                                 } catch (IOException e) {
                                     logger.error("短信发送失败"+e.getMessage());
-                                }*/
+                                }
                             }
                         }
                     }
@@ -456,25 +457,23 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
                 // 审批完成，给申请人发短信
                 //XXX，您好。你在投资系统中提交“XXX”的项目立项申请已审核，结果为【通过】/【驳回】/【观望】！
                 completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" +projectPool.getProjectName() + "的项目机会申请已审核，结果为【同意】";
-                System.out.println(completeContents);
                 if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
+                    try{
+                        SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
                     } catch (IOException e) {
                         logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                    }
                 }
 
             }else{
                 if(StringUtils.isNotEmpty(result)){//代表是终止或者观望
                     completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" +projectPool.getProjectName() + "的项目机会申请已审核，结果为"+result;
-                    System.out.println(completeContents);
                     if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
-                    } catch (IOException e) {
-                        logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                        try{
+                            SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
+                        } catch (IOException e) {
+                            logger.error("短信发送失败"+e.getMessage());
+                        }
                     }
                 }
             }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/TerminationServiceImpl.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sms.SmsSenderUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.flowable.common.constant.ProcessConstants;
 import com.ruoyi.flowable.common.constant.UUIDGenerator;
@@ -27,9 +28,11 @@ import org.flowable.task.api.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.*;
 
 /**
@@ -344,24 +347,22 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                             if (org.apache.commons.lang3.StringUtils.isNotBlank(assignee)) { // 给审批人发送短信
                                 SysUser auditUser = sysUserService.selectUserById(Long.valueOf(assignee));
                                 String auditContents = auditUser.getNickName() + ",您好。投资系统中" + projectTermination.getProjectName() + "的项目终止流程待处理";
-                                System.out.println(auditContents);
                                 if (auditUser != null && StringUtils.isNotBlank(auditUser.getPhonenumber())) {
-                                    /*try{
+                                    try{
                                         SmsSenderUtils.sendSms(auditUser.getPhonenumber(), auditContents);
                                     } catch (IOException e) {
                                         logger.error("短信发送失败"+e.getMessage());
-                                    }*/
+                                    }
                                 }
                             }
                         } else { // 审批人驳回，给申请人发短信
                             String rejectContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectTermination.getProjectName() + "的项目终止申请已审核，结果为【驳回】";
-                            System.out.println(rejectContents);
                             if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                                /*try{
-                                    SmsSenderUtils.sendSms(rejectUser.getPhonenumber(), rejectContents);
+                                try{
+                                    SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), rejectContents);
                                 } catch (IOException e) {
                                     logger.error("短信发送失败"+e.getMessage());
-                                }*/
+                                }
                             }
                         }
                     }
@@ -373,13 +374,12 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
                 // 审批完成，给申请人发短信
                 //XXX，您好。你在投资系统中提交“XXX”的项目终止申请已审核，结果为【通过】/【驳回】/【观望】！
                 completeContents = applyUserInfo.getNickName()+"，您好。你在投资系统中提交" + projectTermination.getProjectName() + "的项目终止申请已审核，结果为【同意】";
-                System.out.println(completeContents);
                 if (applyUserInfo != null && StringUtils.isNotBlank(applyUserInfo.getPhonenumber())) {
-                    /*try{
-                        SmsSenderUtils.sendSms(completeUser.getPhonenumber(), completeContents);
+                    try{
+                        SmsSenderUtils.sendSms(applyUserInfo.getPhonenumber(), completeContents);
                     } catch (IOException e) {
                         logger.error("短信发送失败"+e.getMessage());
-                    }*/
+                    }
                 }
 
             }