Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AppPageType.java

@@ -25,27 +25,31 @@ public enum AppPageType {
     //商品详情
     GOOD_DETAIL(10,	"hbapp_commodity_detail"),
     //我的关联记录
-    MY_RELATED_RECORD(11,	"store_relate_my_record_list"),
+    MY_RELATED_RECORD(11, "store_relate_my_record_list"),
     //门店关联记录
-    STORE_RELATED_RECORD(12,	"store_relate_store_record_list"),
+    STORE_RELATED_RECORD(12, "store_relate_store_record_list"),
     //edaixi订单详情
-    EDAIXI_DETAIL(13,	"hbapp_eWashing_order_preview"),
+    EDAIXI_DETAIL(13, "hbapp_eWashing_order_preview"),
     //人脸到店
-    FACE_ARRIVAL(14,	"hbapp_customer_bind_faceId"),
+    FACE_ARRIVAL(14, "hbapp_customer_bind_faceId"),
     //完善标签
-    PERFECT_TAG(15,	"hbapp_customer_edit_tag"),
+    PERFECT_TAG(15, "hbapp_customer_edit_tag"),
     //销售线索任务列表
-    MARKET_CLUE_TASK(16,	"hbapp_sales_lead_main");
+    MARKET_CLUE_TASK(16, "hbapp_sales_lead_main"),
+    //话务任务逾期提醒
+    TEL_WITHIN_TIME_LIMIT(17, "hbapp_marketing_task_list"),
+    ;
 
 
-    AppPageType(int type, String desc){
+    AppPageType(int type, String desc) {
         this.code = type;
         this.desc = desc;
     }
 
     private int code;
     private String desc;
-	public static String getDescByCode(int type) {
+
+    public static String getDescByCode(int type) {
 			for (AppPageType c : AppPageType.values()) {
 				if (c.getCode() == type) {
 					return c.desc;

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import java.net.URLEncoder;
-import java.util.*;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.utils.URLEncodedUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import cn.hutool.core.collection.CollectionUtil;
-
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
-import com.gic.enterprise.api.dto.MessageDTO;
-import com.gic.haoban.manage.api.dto.ApplicationDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.enums.AppPageType;
-import com.gic.haoban.manage.api.service.ApplicationApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseRelatedMapper;
-import com.gic.haoban.manage.service.entity.TabHaobanApplication;
-import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
-import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
-import com.gic.haoban.manage.service.service.ApplicationService;
 import com.gic.haoban.manage.service.service.DepartmentService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
-
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
 @Service
 public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRelatedApiService {
     private static Logger logger= LoggerFactory.getLogger(StaffDepartmentRelatedApiServiceImpl.class);
@@ -455,15 +445,20 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 		String baseUrl = "/pages/route/index";
 		String addurl = AppPageType.getDescByCode(type);
 		String url = "";
-		if(type ==  AppPageType.INDEX.getCode()){
+		if (type == AppPageType.INDEX.getCode()) {
 			//工作台
-			url = baseUrl+"?pageType="+addurl;
-		}else{
-			url = baseUrl+"?pageType="+addurl;
+			url = baseUrl + "?pageType=" + addurl;
+		} else {
+			url = baseUrl + "?pageType=" + addurl;
+		}
+		url = url + "&data=";
+		String encodeData = null;
+		try {
+			encodeData = URLEncoder.encode(data, StandardCharsets.UTF_8.name());
+		} catch (UnsupportedEncodingException e) {
+			logger.error(e.getMessage());
 		}
-		url = url+"&data=";
-		String encodeData = URLEncoder.encode(data);
-		url = url+encodeData;
+		url = url + encodeData;
 		return url;
 	}