Merge branch 'dev' of http://59.110.226.236:8081/BMLS/up-bmls into dev

up-bmls/up-bmls-admin/src/main/java/com/up/mls/controller/call/CallRecordingController.java

@@ -2,13 +2,10 @@ package com.up.mls.controller.call;
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -19,13 +16,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.up.mls.controller.AbstractController;
 import com.up.mls.service.call.CallRecordingService;
 import com.up.mls.service.call.CallUtilsService;
-import com.up.mls.service.system.IAreasSerevice;
+import com.up.mls.service.system.IDictionaryService;
 import com.up.mls.util.DateUtils;
 import com.up.mls.util.SpringSecurityUtils;
 import com.up.mls.vo.callRecording.CallRecording;
 import com.up.mls.vo.callRecording.GjLog;
-import com.up.mls.vo.deal.ProjectOrder;
-import com.up.mls.vo.system.Areas;
+import com.up.mls.vo.system.Dictionary;
 import com.up.mls.web.domain.AjaxResult;
 import com.up.mls.web.page.TableDataInfo;
 
@@ -43,7 +39,8 @@ public class CallRecordingController extends AbstractController{
 	private CallRecordingService callRecordService;
 	@Autowired
 	private CallUtilsService callUtilsService;
-
+	@Autowired
+	private IDictionaryService dictionaryService;
 
 
 	/**
@@ -88,11 +85,16 @@ public class CallRecordingController extends AbstractController{
 			String createTimeStr=DateUtils.getStringDate(entity.getCreateTime());
 			String title="经纪人      【"+entity.getAniName()+"】"+entity.getAni()+"在["+createTimeStr+"]  电话勾搭了 经纪人【"+entity.getDnisName()+"】"+entity.getDnis();
 			mmap.put("title",title);
-			String voice=this.callUtilsService.findRecordEntity(entity.getUuid());
-			if(StringUtils.isNotEmpty(voice) && voice.contains("http")){
-				mmap.put("voice", voice);
+			mmap.put("sjType",entity.getSjType()==null?"1":entity.getSjType());
+			if("2".equals(entity.getSjType())){
+				mmap.put("voice", entity.getVoice()==null?"未接通":entity.getVoice());
 			}else{
-				mmap.put("voice", "未接通");
+				String voice=this.callUtilsService.findRecordEntity(entity.getUuid());
+				if(StringUtils.isNotEmpty(voice) && voice.contains("http")){
+					mmap.put("voice", voice);
+				}else{
+					mmap.put("voice", "未接通");
+				}
 			}
 			mmap.put("entity",entity);
 			List<GjLog> gjList=this.callRecordService.findGjList(id);

up-bmls/up-bmls-admin/src/main/java/com/up/mls/vo/callRecording/CallRecording.java

@@ -43,7 +43,7 @@ public class CallRecording{
 	private String   duration;
 	private String   ifConnect;
 	private String   endReason;
-	
+	private String   sjType;
 	
      
 	private Areas area;

up-bmls/up-bmls-admin/src/main/resources/configs/mybatis/xml/callRecording/CallRecordingMapper.xml

@@ -28,6 +28,8 @@
   		<result column="if_connect"  property="ifConnect" />
   		<result column="duration"  property="duration" />
   		<result column="end_reason"  property="endReason" />
+  		<result column="voice"  property="voice" />
+  		<result column="sj_type"  property="sjType" />
 		<association property="area" column="area_id" javaType="Areas"	resultMap="areaResult" />
 		<association property="businessArea" column="business_area_id" javaType="BusinessArea"	resultMap="businessAreaResult" />
 	</resultMap>

up-bmls/up-bmls-admin/src/main/resources/templates/shopPhoto/edit.html

@@ -124,7 +124,7 @@
                     $.modal.alertError("系统错误");
                 },
                 success: function (data) {
-                    $.operate.saveSuccess(data);
+                    $.operate.saveNoRefresh(data);
                 }
             });
         })
@@ -143,7 +143,7 @@
                     $.modal.alertError("系统错误");
                 },
                 success: function (data) {
-                    $.operate.saveSuccess(data);
+                    $.operate.saveNoRefresh(data);
                 }
             });
         })