更新TZS代码

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/WechatDispatchFeedbackDto.java

@@ -22,6 +22,9 @@ public class WechatDispatchFeedbackDto {
     @ApiModelProperty(value = "维修结果")
     private String fixResult;
 
+    @ApiModelProperty(value = "处置结果")
+    private String dealResult;
+
     @ApiModelProperty(value = "电梯故障原因分类")
     private String errorResult;
 

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

@@ -340,7 +340,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     set(AlertFormValue::getFieldValue,wechatDispatchFeedbackDto.getRemark()).
                     eq(AlertFormValue::getFieldCode,"fix_remark").
                     eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
-
+            dispatchPaper.setRepairOrgName(task.getResponseOrgName());
+            dispatchPaper.setRepairUser(task.getResponseUserName());
         } else if(alertCalled.getAlarmTypeCode().equals(AlertStageEnums.GZWX.getId())) { // 故障维修
             iAlertFormValueService.update(new LambdaUpdateWrapper<AlertFormValue>().
                     set(AlertFormValue::getFieldValue,"主动反馈").
@@ -359,6 +360,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     set(AlertFormValue::getFieldValue,wechatDispatchFeedbackDto.getRemark()).
                     eq(AlertFormValue::getFieldCode,"fix_remark").
                     eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
+            dispatchPaper.setRepairOrgName(task.getResponseOrgName());
+            dispatchPaper.setRepairUser(task.getResponseUserName());
         } else if(alertCalled.getAlarmTypeCode().equals(AlertStageEnums.TSZX.getId())) {// 投诉建议
             iAlertFormValueService.update(new LambdaUpdateWrapper<AlertFormValue>().
                     set(AlertFormValue::getFieldValue,"主动反馈").
@@ -377,6 +380,8 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
                     set(AlertFormValue::getFieldValue,wechatDispatchFeedbackDto.getRemark()).
                     eq(AlertFormValue::getFieldCode,"main_feedback_result").
                     eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
+            dispatchPaper.setDealUser(task.getResponseUserName());
+            dispatchPaper.setDealOrgName(task.getResponseOrgName());
         }
 
         // 反馈时间
@@ -390,33 +395,59 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
 
         dispatchPaperServiceImpl.updateById(dispatchPaper);
 
-        //  动态字段
-        iAlertFormValueService.update(new LambdaUpdateWrapper<AlertFormValue>().
-                set(AlertFormValue::getFieldValue,wechatDispatchFeedbackDto.getRemark()).
-                eq(AlertFormValue::getFieldCode,"fix_remark").
-                eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
 
-        if (StringUtils.isNotBlank(wechatDispatchFeedbackDto.getFixResult())) {
-            LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(DataDictionary::getType, TzsCommonParam.WXJG).eq(DataDictionary::getCode, wechatDispatchFeedbackDto.getFixResult());
-            DataDictionary fixResult = iDataDictionaryService.getOne(queryWrapper);
+        if(alertCalled.getAlarmTypeCode().equals(AlertStageEnums.TSZX.getId())) {// 投诉建议
+            //  动态字段
             iAlertFormValueService.update(new LambdaUpdateWrapper<AlertFormValue>().
-                    set(AlertFormValue::getFieldValue,fixResult.getName()).
-                    set(AlertFormValue::getFieldValueCode,fixResult.getCode()).
-                    eq(AlertFormValue::getFieldCode,"fix_result").
+                    set(AlertFormValue::getFieldValue,wechatDispatchFeedbackDto.getRemark()).
+                    eq(AlertFormValue::getFieldCode,"main_feedback_result").
                     eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
-        }
-        if (StringUtils.isNotBlank(wechatDispatchFeedbackDto.getErrorResult())) {
-            LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(DataDictionary::getType, TzsCommonParam.GZYY).eq(DataDictionary::getCode, wechatDispatchFeedbackDto.getErrorResult());
-            DataDictionary fixResult = iDataDictionaryService.getOne(queryWrapper);
+
+            if (StringUtils.isNotBlank(wechatDispatchFeedbackDto.getDealResult())) {
+                LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(DataDictionary::getType, TzsCommonParam.CZJG).eq(DataDictionary::getCode, wechatDispatchFeedbackDto.getDealResult());
+                DataDictionary actionResult = iDataDictionaryService.getOne(queryWrapper);
+                iAlertFormValueService.update(new LambdaUpdateWrapper<AlertFormValue>().
+                        set(AlertFormValue::getFieldValue,actionResult.getName()).
+                        set(AlertFormValue::getFieldValueCode,actionResult.getCode()).
+                        eq(AlertFormValue::getFieldCode,"action_result").
+                        eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
+            }
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(task.getAlertId(),TzsCommonParam.WXFK_TS,task.getSequenceNbr(),null);
+
+
+
+        } else { // 困人救援 或者 投诉建议
+            //  动态字段
             iAlertFormValueService.update(new LambdaUpdateWrapper<AlertFormValue>().
-                    set(AlertFormValue::getFieldValue,fixResult.getName()).
-                    set(AlertFormValue::getFieldValueCode,fixResult.getCode()).
-                    eq(AlertFormValue::getFieldCode,"error_result").
+                    set(AlertFormValue::getFieldValue,wechatDispatchFeedbackDto.getRemark()).
+                    eq(AlertFormValue::getFieldCode,"fix_remark").
                     eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
+
+            if (StringUtils.isNotBlank(wechatDispatchFeedbackDto.getFixResult())) {
+                LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(DataDictionary::getType, TzsCommonParam.WXJG).eq(DataDictionary::getCode, wechatDispatchFeedbackDto.getFixResult());
+                DataDictionary fixResult = iDataDictionaryService.getOne(queryWrapper);
+                iAlertFormValueService.update(new LambdaUpdateWrapper<AlertFormValue>().
+                        set(AlertFormValue::getFieldValue,fixResult.getName()).
+                        set(AlertFormValue::getFieldValueCode,fixResult.getCode()).
+                        eq(AlertFormValue::getFieldCode,"fix_result").
+                        eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
+            }
+            if (StringUtils.isNotBlank(wechatDispatchFeedbackDto.getErrorResult())) {
+                LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(DataDictionary::getType, TzsCommonParam.GZYY).eq(DataDictionary::getCode, wechatDispatchFeedbackDto.getErrorResult());
+                DataDictionary fixResult = iDataDictionaryService.getOne(queryWrapper);
+                iAlertFormValueService.update(new LambdaUpdateWrapper<AlertFormValue>().
+                        set(AlertFormValue::getFieldValue,fixResult.getName()).
+                        set(AlertFormValue::getFieldValueCode,fixResult.getCode()).
+                        eq(AlertFormValue::getFieldCode,"error_result").
+                        eq(AlertFormValue::getAlertCalledId,task.getPaperId()));
+            }
+            repairConsultServiceImpl.saveRepairConsultByAlertIdType(task.getAlertId(),TzsCommonParam.WXFK,task.getSequenceNbr(),null);
         }
-        repairConsultServiceImpl.saveRepairConsultByAlertIdType(task.getAlertId(),TzsCommonParam.WXFK,task.getSequenceNbr(),null);
+
+