96333后端修改（派遣模板字段获取错误修改）

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -15,8 +15,25 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
-import com.yeejoin.amos.boot.module.tzs.api.dto.*;
-import com.yeejoin.amos.boot.module.tzs.api.entity.*;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledObjsDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledQueryDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledRecordDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertHandlerInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.AlertPaperInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.tzs.api.dto.TzsCitInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBusinessListDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.WechatMyBussinessDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.tzs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchPaper;
+import com.yeejoin.amos.boot.module.tzs.api.entity.DispatchTask;
+import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
+import com.yeejoin.amos.boot.module.tzs.api.entity.TzsCitInfo;
+import com.yeejoin.amos.boot.module.tzs.api.entity.VoiceRecordFile;
 import com.yeejoin.amos.boot.module.tzs.api.enums.AlertStageEnums;
 import com.yeejoin.amos.boot.module.tzs.api.enums.DispatchPaperEnums;
 import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentClassifityEnum;
@@ -25,8 +42,6 @@ import com.yeejoin.amos.boot.module.tzs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.tzs.api.service.TzsAuthService;
 import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.apache.commons.lang.text.StrBuilder;
 import org.apache.logging.log4j.LogManager;
@@ -36,14 +51,21 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -153,12 +175,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 wrapper.eq(DataDictionary::getCode, alertCalledDto.getUseSiteCategory());
                 DataDictionary dataDictionary = iDataDictionaryService.getOne(wrapper);
                 if (!ValidationUtil.isEmpty(dataDictionary)) {
-                    alertCalledDto.setUseUnit(dataDictionary.getName());
+//                    alertCalledDto.setUseUnit(dataDictionary.getName());
+                    alertCalledDto.setUseSiteCategory(dataDictionary.getName());
                 } else {
-                    alertCalledDto.setUseUnit("");
+                    alertCalledDto.setUseSiteCategory("");
                 }
             } else {
-                alertCalledDto.setUseUnit("");
+                alertCalledDto.setUseSiteCategory("");
             }
             String voiceRecord = "";
             VoiceRecordFile temp = voiceRecordFileServiceImpl.getOne(new LambdaQueryWrapper<VoiceRecordFile>().eq(VoiceRecordFile::getAlertId,id).eq(VoiceRecordFile::getAlertStageCode,"860").orderByAsc(VoiceRecordFile::getRecDate));

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java

@@ -191,7 +191,7 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             useSiteCategory = ValidationUtil.isEmpty(categoryDict) ? "" : categoryDict.getName();
         }
         String useUnit = elevator.getUseUnit();
-        content = content.replace("$call_time",createTime).replace("$address",address).replace("$rescue_code",rescueCode).replace("$use_site_category",useSiteCategory);
+        content = content.replace("$call_time", createTime).replace("$address", address).replace("$rescue_code", rescueCode).replace("$use_site_category", useSiteCategory);
         String typeCode = "";
         if(AlertStageEnums.KRJY.toString().equals(alertTypeCode)) {
             typeCode  = AlertStageEnums.KRJY.getId();
@@ -228,14 +228,14 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                 break;
             case "GZWX" : // 故障维修
                 dispatchTaskDto.setIsSaveTask(false);
-                desc = dynamicParms.get("desc") == null ? "" : dynamicParms.get("desc");
-                content = content.replace("$use_unit",useUnit).replace("$desc",desc);
+                desc = dynamicParms.get("fault_report") == null ? "" : dynamicParms.get("fault_report");
+                content = content.replace("$use_unit", useUnit).replace("$desc", desc);
                 break;
             case "TSZX" : // 投诉咨询
                 dispatchTaskDto.setIsSaveTask(false);
-                desc = dynamicParms.get("desc") == null ? "" : dynamicParms.get("desc");
-                content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone",contactPhone);
-                content = content.replace("$use_unit",useUnit).replace("$desc",desc);
+                desc = dynamicParms.get("complaint_consulttation") == null ? "" : dynamicParms.get("complaint_consulttation");
+                content = content.replace("$emergency_call",emergencyCall).replace("$contact_phone", contactPhone);
+                content = content.replace("$use_unit", useUnit).replace("$desc", desc);
                 break;
         }
         dispatchTaskDto.setDispatchContext(content);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/VoiceRecordLogServiceImpl.java

@@ -13,11 +13,6 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.VoiceRecordLog;
 import com.yeejoin.amos.boot.module.tzs.api.mapper.VoiceRecordLogMapper;
 import com.yeejoin.amos.boot.module.tzs.api.service.ICtiService;
 import com.yeejoin.amos.boot.module.tzs.api.service.IVoiceRecordLogService;
-import com.yeejoin.amos.component.feign.config.TokenOperation;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.eclipse.paho.client.mqttv3.MqttException;
@@ -26,11 +21,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -121,7 +114,7 @@ public class VoiceRecordLogServiceImpl extends BaseService<VoiceRecordLogDto,Voi
                 model.setTelStartTime(telStartTime);
                 model.setTelEndTime(telEndTime);
                 if(1 == recordInfo.getInteger("callType")) {
-                    model.setFileType("客户呼入");
+                    model.setFileType("呼入");
                 } else if(2 == recordInfo.getInteger("callType")) {
                     model.setFileType("坐席呼出");
                 }