Merge branch 'feature/xgh/bug/0415' into 'master'

Feature/xgh/bug/0415

See merge request !1734

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/QywxSendService.java

@@ -11,7 +11,7 @@ public interface QywxSendService {
      * 企微群发-传入素材(ecm、群发助手)
      */
     public ServiceResponse<String> sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList,
-            List<String> materialIdList);
+            List<String> materialIdList , String planId);
 
     /**
      * 素材-分享

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java

@@ -73,27 +73,27 @@ public class QywxSendServiceImpl implements QywxSendService {
 
     @Override
     public ServiceResponse<String> sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList,
-            List<String> materialIdList) {
-        return this.send(wxEnterpriseId, staffId, extendUserList, materialIdList, null, 1 , single);
+            List<String> materialIdList,String planId) {
+        return this.send(wxEnterpriseId, staffId, extendUserList, materialIdList, null, 1 , single , planId , 1);
     }
 
     @Override
     public ServiceResponse<String> sendMessageShare(String wxEnterpriseId, String staffId, List<String> extendUserList,
             List<ContentMaterialDTO> imageList, String message) {
         List<String> materialIdList = this.materialService.getImageMediaId(wxEnterpriseId, imageList, 1);
-        return this.send(wxEnterpriseId, staffId, extendUserList, materialIdList, message, 2,null);
+        return this.send(wxEnterpriseId, staffId, extendUserList, materialIdList, message, 2,null,null,null);
     }
 
     // 群发发送
     private ServiceResponse<String> send(String wxEnterpriseId, String staffId, List<String> extendUserList,
-            List<String> materialIdList, String message, int from , String chatType) {
+            List<String> materialIdList, String message, int from , String chatType ,String planId , Integer planType) {
         TabHaobanStaff tabHaobanStaff = staffService.selectById(staffId);
         if (null == tabHaobanStaff) {
             log.info("staff不存在,staffId={}", staffId);
             return ServiceResponse.failure("9999", "群发失败,成员不存在");
         }
         // 群发请求参数
-        QywxExternalMessageDTO messageDTO = this.getMessage(from, message, materialIdList,chatType);
+        QywxExternalMessageDTO messageDTO = this.getMessage(from, message, materialIdList,chatType,planId,planType);
         log.info("群发信息={}",JSON.toJSONString(messageDTO));
         if (messageDTO.getAttachments().isEmpty() && StringUtils.isBlank(messageDTO.getContent())) {
             log.info("群发素材不存在, 群发创建失败");
@@ -132,7 +132,7 @@ public class QywxSendServiceImpl implements QywxSendService {
             List<ContentMaterialDTO> imageList) {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         List<String> materialIdList = this.materialService.getImageMediaId(wxEnterpriseId, imageList, 2);
-        QywxExternalMessageDTO dto = this.getMessage(2, message, materialIdList,null);
+        QywxExternalMessageDTO dto = this.getMessage(2, message, materialIdList,null,null,null);
         MomentTaskDTO moment = EntityUtil.changeEntity(MomentTaskDTO.class, dto);
         Text text = new Text();
         text.setContent(dto.getContent());
@@ -166,7 +166,7 @@ public class QywxSendServiceImpl implements QywxSendService {
     }
 
     // from 1好办素材 2内容中台
-    private QywxExternalMessageDTO getMessage(int from, String message, List<String> materialIdList , String chatType) {
+    private QywxExternalMessageDTO getMessage(int from, String message, List<String> materialIdList , String chatType , String planId , Integer planType) {
         QywxExternalMessageDTO messageDTO = new QywxExternalMessageDTO();
         messageDTO.setChatType(chatType);
         List<QywxMessageMaterialDTO> attachList = new ArrayList<>();
@@ -185,7 +185,7 @@ public class QywxSendServiceImpl implements QywxSendService {
                 if (material.getMaterialType() == 1) {
                     messageDTO.setContent(material.getMaterialContent());
                 } else {
-                    attachList.add(this.getMessageMaterial(material));
+                    attachList.add(this.getMessageMaterial(material,planId,planType));
                 }
             });
         }
@@ -196,7 +196,7 @@ public class QywxSendServiceImpl implements QywxSendService {
     /**
      * 素材发送对象构造
      */
-    private QywxMessageMaterialDTO getMessageMaterial(MaterialDTO material) {
+    private QywxMessageMaterialDTO getMessageMaterial(MaterialDTO material,String planId , Integer planType) {
         // 素材类型
         Integer materialType = material.getMaterialType();
         // 企微对应的id
@@ -227,6 +227,16 @@ public class QywxSendServiceImpl implements QywxSendService {
             miniprogramMaterialDTO.setPicMediaId(maerialId);
             miniprogramMaterialDTO.setAppid(material.getAppId());
             miniprogramMaterialDTO.setPage(material.getLink());
+           /* if(null != planType && StringUtils.isNotBlank(planId)) {
+                String url = "qtActivityType="+planType+"&qtActivityId="+planId ;
+                if(material.getLink().contains("?")) {
+                    url = "&" + url ;
+                }else {
+                    url = "?" +url ;
+                }
+                miniprogramMaterialDTO.setPage(material.getLink()+url);
+            }*/
+            log.info("群发链接={}",material.getLink(),miniprogramMaterialDTO.getPage());
             dto.setMsgType(QywxMediaTypeEnum.MINIPROGRAM.getName());
             dto.setMiniprogram(miniprogramMaterialDTO);
         }
@@ -235,12 +245,12 @@ public class QywxSendServiceImpl implements QywxSendService {
     
     @Override
     public ServiceResponse<String> sendChatMessage(String wxEnterpriseId, String staffId, List<String> materialIdList) {
-        return this.send(wxEnterpriseId, staffId, null, materialIdList, null, 1 , group);
+        return this.send(wxEnterpriseId, staffId, null, materialIdList, null, 1 , group,null,null);
     }
 
     @Override
     public ServiceResponse<String> sendChatMessage(String wxEnterpriseId, String staffId, List<ContentMaterialDTO> imageList, String message) {
         List<String> materialIdList = this.materialService.getImageMediaId(wxEnterpriseId, imageList, 1);
-        return this.send(wxEnterpriseId, staffId, null, materialIdList, message, 2 , group);
+        return this.send(wxEnterpriseId, staffId, null, materialIdList, message, 2 , group,null,null);
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -1178,7 +1178,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      */
     @Override
     public JSONResponse sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList, List<String> materialIdList, String planId) {
-        com.gic.api.base.commons.ServiceResponse<String> resp = this.qywxSendService.sendMessage(wxEnterpriseId, staffId, extendUserList, materialIdList) ;
+        com.gic.api.base.commons.ServiceResponse<String> resp = this.qywxSendService.sendMessage(wxEnterpriseId, staffId, extendUserList, materialIdList,planId) ;
         return this.retJson(resp) ;
     }
     

haoban-manage3-service/src/main/resources/mapper/TabHaobanAuditMapper.xml

@@ -210,10 +210,8 @@
         from tab_haoban_audit
         where
         status_flag = 1
-        <if test="clerkType==1">
-            <if test="auditType == null || auditType == -1">
-                and audit_type in (2,3,4,5)
-            </if>
+        <if test="auditType == null || auditType == -1">
+            and audit_type in (2,3,4,5)
         </if>
         <if test="auditType != null and auditType != -1">
             and audit_type = #{auditType}

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaterialContentMapper.xml

@@ -92,7 +92,7 @@
   <select id="selectByUrl" resultMap="result-map-tabHaobanMaterialContent">
   	SELECT 
   		 <include refid="Base_Column_List"/>
-  	 FROM tab_haoban_material_content WHERE wx_enterprise_id=#{wxEnterpriseId} and url_md5=#{urlMd5} and media_type = #{mediaType} and status_flag = 1
+  	 FROM tab_haoban_material_content WHERE wx_enterprise_id=#{wxEnterpriseId} and url_md5=#{urlMd5} and media_type = #{mediaType} and status_flag = 1 limit 1
   </select>
     <select id="listByIds" resultMap="result-map-tabHaobanMaterialContent">
         select