Merge branch 'branch20211008'

jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java

@@ -23,7 +23,9 @@ public enum CompanyMessageEnums {
     MSG9("QY_9_YJTZ_MAIL","邮寄通知","projectName"),//查看该物流信息，projectName
     MSG10("QY_10_YJTZ_MAIL_CONTRACT","邮寄通知","contractName"),//查看该物流信息，contractName
     MSG11("QY_11_CKTZ_PAY","催款通知","projectName"),//弹窗：查看该项目详情
-    MSG12("QY_12_WJTZ_WORK_GROUP_SEND","文件通知","workGroupName,systemAddress,wxName");//弹窗：查看该项目详情，workGroupName，systemUrl，wxName
+    MSG12("QY_12_WJTZ_WORK_GROUP_SEND","文件通知","workGroupName,systemAddress,wxName"),//弹窗：查看该项目详情，workGroupName，systemUrl，wxName
+    MSG13("QY_13_HYTZ_FBW_CREATE","会议通知","meetingName,busId");//点击跳转到报名页面，meetingName,busId
+
 
 
     private String code;

jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java

@@ -33,7 +33,8 @@ public enum MessageUrlEnums {
     C_OPEN_TYPE9("C_OPEN_TYPE9","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu"),
     C_OPEN_TYPE10("C_OPEN_TYPE10","href","https://www.kuaidi100.com/all/hhair56.shtml?mscomnu"),
     C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"),
-    C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal");
+    C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal"),
+    C_OPEN_TYPE13("C_OPEN_TYPE13","href","");
 
     /**
      * 业务类型(email:邮件 bpm:流程)

jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java

@@ -77,8 +77,7 @@ public class SendMessageServiceImpl implements SendMessageService {
         if(!Objects.isNull(map)) {
             // 替换企业端系统url与小程序名称
             // todo 替换系统地址，小程序名称
-            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())
-                    ||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
+            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
                     || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
@@ -223,8 +222,9 @@ public class SendMessageServiceImpl implements SendMessageService {
                 }
 
             }
-            // 会议通知 去掉 工作组xxx（会议名称）报名已开始，点击报名>>超链接中的busId
-            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())){
+            // 会议通知 去掉 工作组/分标委xxx（会议名称）报名已开始，点击报名>>超链接中的busId
+            if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())
+                || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG13.getCode())){
                 if(map.containsKey("busId")){
                     map.remove("busId");
                 }
@@ -369,6 +369,12 @@ public class SendMessageServiceImpl implements SendMessageService {
                         signature = "中汽中心标准所";
                         templateId =  "e1a089109aaa4820927d488613171b54";//todo 审核不通过
                         break;
+                    case "QY_13_HYTZ_FBW_CREATE":
+                        //中汽中心标准所-企业端-会议通知-13
+                        sender = "8821092414406";
+                        signature = "中汽中心标准所";
+                        templateId =  "926e49e09008438b88d80849fe9f5bbb";
+                        break;
                     default:
                         throw new JeroBootException("codeType flase.");
                 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingSituationMapper.xml

@@ -153,7 +153,7 @@
     </select>
 
     <select id="pageListContract" resultMap="PayMeetingSituationResultMap">
-        select pms.*
+        select distinct pms.*
         from pay_meeting_situation pms
                      left JOIN pay_payment_record ppr ON ppr.project_id = pms.id
         ${ew.customSqlSegment}