Administrator / xlyAi

Commit 4908ee248f3da8b840df7381efdf59ec30ff7939

Authored by qianbao
1 parent b2cfdb10

添加未清选择 改成动态引导语

Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
src/main/java/com/xly/service/QuoService.java
  View file @4908ee2
@@ -76,6 +76,7 @@ public class QuoService { @@ -76,6 +76,7 @@ public class QuoService {
76 part.put("bEmpty",p.getBEmpty()); 76 part.put("bEmpty",p.getBEmpty());
77 part.put("sValue", sValue); 77 part.put("sValue", sValue);
78 part.put("iOrder", p.getIOrder()); 78 part.put("iOrder", p.getIOrder());
  79 + part.put("sGroup",p.getSGroup());
79 part.put("sParamMissMemo", p.getSParamMissMemo()==null?StrUtil.EMPTY:p.getSParamMissMemo()); 80 part.put("sParamMissMemo", p.getSParamMissMemo()==null?StrUtil.EMPTY:p.getSParamMissMemo());
80 part.put("sParamConfigValue",p.getSParamConfigValue()==null?StrUtil.EMPTY:p.getSParamConfigValue()); 81 part.put("sParamConfigValue",p.getSParamConfigValue()==null?StrUtil.EMPTY:p.getSParamConfigValue());
81 //获取动态参数 82 //获取动态参数
@@ -120,6 +121,7 @@ public class QuoService { @@ -120,6 +121,7 @@ public class QuoService {
120 part.put("iOrder", dynamic.getIOrder()); 121 part.put("iOrder", dynamic.getIOrder());
121 part.put("sParamConfigValue",dynamic.getSParamConfigValue()); 122 part.put("sParamConfigValue",dynamic.getSParamConfigValue());
122 part.put("sParamMissMemo", dynamic.getSParamMissMemo()); 123 part.put("sParamMissMemo", dynamic.getSParamMissMemo());
  124 + part.put("sGroup",dynamic.getSGroup());
123 //获取动态参数 125 //获取动态参数
124 adddynamicData(sValue,dataAll, dynamic, finalArgsOld, sAll, part); 126 adddynamicData(sValue,dataAll, dynamic, finalArgsOld, sAll, part);
125 partList.add(part); 127 partList.add(part);
@@ -159,12 +161,13 @@ public class QuoService { @@ -159,12 +161,13 @@ public class QuoService {
159 List<Map<String,Object>> dynamicData = new ArrayList<>(); 161 List<Map<String,Object>> dynamicData = new ArrayList<>();
160 dataParamDynamic.forEach(dynamic->{ 162 dataParamDynamic.forEach(dynamic->{
161 Map<String,Object> dynamicOne = new HashMap<>(); 163 Map<String,Object> dynamicOne = new HashMap<>();
162 - Object dynamicValue = getValue( p,finalArgsOld); 164 + Object dynamicValue = getValue(dynamic,finalArgsOld);
163 dynamicOne.put("sName",dynamic.getSParamValue()); 165 dynamicOne.put("sName",dynamic.getSParamValue());
164 dynamicOne.put("showName",dynamic.getSParam()); 166 dynamicOne.put("showName",dynamic.getSParam());
165 dynamicOne.put("bEmpty",dynamic.getBEmpty()); 167 dynamicOne.put("bEmpty",dynamic.getBEmpty());
166 dynamicOne.put("sValue", dynamicValue); 168 dynamicOne.put("sValue", dynamicValue);
167 dynamicOne.put("iOrder", dynamic.getIOrder()); 169 dynamicOne.put("iOrder", dynamic.getIOrder());
  170 + dynamicOne.put("sGroup",dynamic.getSGroup());
168 dynamicOne.put("sParamMissMemo", dynamic.getSParamMissMemo()==null?StrUtil.EMPTY:dynamic.getSParamMissMemo()); 171 dynamicOne.put("sParamMissMemo", dynamic.getSParamMissMemo()==null?StrUtil.EMPTY:dynamic.getSParamMissMemo());
169 dynamicOne.put("sParamConfigValue",dynamic.getSParamConfigValue()==null?StrUtil.EMPTY:dynamic.getSParamConfigValue()); 172 dynamicOne.put("sParamConfigValue",dynamic.getSParamConfigValue()==null?StrUtil.EMPTY:dynamic.getSParamConfigValue());
170 //获取动态参数 173 //获取动态参数
src/main/java/com/xly/service/XlyErpService.java
  View file @4908ee2
@@ -422,7 +422,7 @@ public class XlyErpService { @@ -422,7 +422,7 @@ public class XlyErpService {
422 .sCopyToSrcId(session.getSCopyToSrcId()) 422 .sCopyToSrcId(session.getSCopyToSrcId())
423 .dbType(session.getDbType()) 423 .dbType(session.getDbType())
424 .dbCach(session.getDbCach()) 424 .dbCach(session.getDbCach())
425 - .sReturnType(sReturnType) 425 + .sReturnType(isConfirmed?ReturnTypeCode.HTML.getCode():sReturnType)
426 .build(); 426 .build();
427 }else if(session.getCurrentScene()== null ){ 427 }else if(session.getCurrentScene()== null ){
428 return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText("当前场景:没有选择 退回当前场景 请输入 "+ CommonConstant.RESET + sResponMessage).dbType(session.getDbType()).dbCach(session.getDbCach()).sReturnType(sReturnType).build(); 428 return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText("当前场景:没有选择 退回当前场景 请输入 "+ CommonConstant.RESET + sResponMessage).dbType(session.getDbType()).dbCach(session.getDbCach()).sReturnType(sReturnType).build();