Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -196,11 +196,12 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                 inspectionFile.setQuestionCode(questionFile.getQuestionCode());
                 //问题id
                 //根据questionCode查询问题类型表出对应的id值
+                QuestionType questionTypeData = null;
                 if (StringUtils.isNotEmpty(questionFile.getQuestionCode())) {
-                    QuestionType questionType = questionTypeMapper.selectOne(Wrappers.<QuestionType>lambdaQuery()
+                    questionTypeData= questionTypeMapper.selectOne(Wrappers.<QuestionType>lambdaQuery()
                             .eq(QuestionType::getCode, questionFile.getQuestionCode())
                             .eq(QuestionType::getMark, 1));
-                    inspectionFile.setQuestionId(questionType.getId());
+                    inspectionFile.setQuestionId(questionTypeData.getId());
                 }
                 // 问题名称
                 inspectionFile.setQuestionName(questionFile.getQuestionName());
@@ -227,8 +228,12 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                 }
                 inspectionFile.setFileImage(fileMarkerUrl);
 
-                // 问题图片审核状态
-                inspectionFile.setStatus(InspectionFileStatusEnum.WAIT_CONFIRMED.getCode());
+                // 问题图片审核状态 如果是自动生成工单状态为已生成工单
+                if(ObjectUtil.isNotNull(questionTypeData) && questionTypeData.getIsGenerateWorkorder() == 1){
+                    inspectionFile.setStatus(InspectionFileStatusEnum.GENERATE_ORDER.getCode());
+                }else {
+                    inspectionFile.setStatus(InspectionFileStatusEnum.WAIT_CONFIRMED.getCode());
+                }
                 // 问题图片来源
                 inspectionFile.setSource(SourceEnum.AI.getCode());
                 inspectionFile.setCreateUser(business.getCreateUser()); // 设置默认用户