Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -297,7 +297,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     dispatchSaveFeedbackDto.setErrorResult(value);
                     break;
                 case TzsCommonParam.FIX_REMARK:
-                    value = alertFormValue.getFieldValueCode();
+                    value = alertFormValue.getFieldValue();
                     dispatchSaveFeedbackDto.setFixRemark(value);
                     break;
             }
@@ -366,11 +366,11 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                     }
         });
         dispatchPaper.setFeedbackCode(dispatchSaveFeedbackDto.getFeedbackCode());
-        dispatchPaper.setFeedbackType(dispatchSaveFeedbackDto.getFeedbackType());
+        dispatchPaper.setFeedbackType(DispatchPaperEnums.getEnumById(dispatchSaveFeedbackDto.getFeedbackCode()).getValue());
         dispatchPaper.setFeedbackFinishTime(dispatchSaveFeedbackDto.getFeedbackFinishTime());
         dispatchPaper.setFeedbackUid(dispatchSaveFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchSaveFeedbackDto.getFeedbackUname());
-        if(dispatchPaper.getFeedbackTime() == null && dispatchSaveFeedbackDto.getFeedbackTime() != null) {
+        if(dispatchPaper.getFeedbackTime() == null && dispatchSaveFeedbackDto.getFeedbackFinishTime() != null) {
             // 维修反馈
             Long taskId = dispatchPaper.getRepairOrgTaskId() != null ? dispatchPaper.getRepairOrgTaskId() : dispatchPaper.getUseOrgTaskId();
             if(taskId == null) {
@@ -379,8 +379,8 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             repairConsultServiceImpl.saveRepairConsultByAlertIdType(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.WXFK,taskId,user);
             // 修改警情到维修反馈
             alertCalledServiceImpl.updateAlertStageByAlertId(dispatchSaveFeedbackDto.getAlertId(),TzsCommonParam.WXFK);
+            dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackFinishTime()); // 没有回访时间只有维修完成时间
         }
-        dispatchPaper.setFeedbackTime(dispatchSaveFeedbackDto.getFeedbackTime());
         // 保存动态表单数据
         iAlertFormValueService.updateBatchById(dynamicFormAlert);
         // 保存派遣表
@@ -569,7 +569,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             }
         });
         dispatchPaper.setFeedbackCode(dispatchRepairFeedbackDto.getFeedbackCode());
-        dispatchPaper.setFeedbackType(dispatchRepairFeedbackDto.getFeedbackType());
+        dispatchPaper.setFeedbackType(DispatchPaperEnums.getEnumById(dispatchRepairFeedbackDto.getFeedbackCode()).getValue());
         dispatchPaper.setFeedbackFinishTime(dispatchRepairFeedbackDto.getFeedbackFinishTime());
         dispatchPaper.setFeedbackUid(dispatchRepairFeedbackDto.getFeedbackUid());
         dispatchPaper.setFeedbackUname(dispatchRepairFeedbackDto.getFeedbackUname());
@@ -773,7 +773,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
             }
         });
         dispatchPaper.setFeedbackCode(dispatchConsultFeedbackDto.getFeedbackCode());
-        dispatchPaper.setFeedbackType(dispatchConsultFeedbackDto.getFeedbackType());
+        dispatchPaper.setFeedbackType(DispatchPaperEnums.getEnumById(dispatchConsultFeedbackDto.getFeedbackCode()).getValue());
         if(dispatchPaper.getFeedbackTime() == null && dispatchConsultFeedbackDto.getFeedbackTime() != null) {
             tempMap.put("FEEDBACK",true);
         }

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

@@ -93,7 +93,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$call",emergency_call);
             content = content.replace("$area",area).replace("$alertType",alertType);
         } else if(TzsCommonParam.PQ.equals(type)) {
-            String createUser = user.getUserName();
+            String createUser =  user.getRealName();
             DispatchTask dispatchTask = dispatchTaskServiceImpl.getById(taskId);
             String unit = dispatchTask.getResponseOrgName();
             if(unit == null)
@@ -129,7 +129,7 @@ public class RepairConsultServiceImpl extends BaseService<RepairConsultDto,Repai
             String FKFS = rescueProcessDto.getArriveFeedbackType();
             content = content.replace("$FKFS",FKFS);
         } else if(TzsCommonParam.JYHF.equals(type)) {
-            String createUser = user.getUserName();
+            String createUser =  user.getRealName();
             String create = alertCalledVo.getEmergencyPerson();
             content = content.replace("$createTime",createTime).replace("$createUser",createUser).replace("$create",create);
         } else if(TzsCommonParam.WXFK.equals(type)) { //从派遣单获取数据