diff --git a/src/main/java/com/xly/service/QuoService.java b/src/main/java/com/xly/service/QuoService.java index 6dab937..48aff00 100644 --- a/src/main/java/com/xly/service/QuoService.java +++ b/src/main/java/com/xly/service/QuoService.java @@ -76,6 +76,7 @@ public class QuoService { part.put("bEmpty",p.getBEmpty()); part.put("sValue", sValue); part.put("iOrder", p.getIOrder()); + part.put("sGroup",p.getSGroup()); part.put("sParamMissMemo", p.getSParamMissMemo()==null?StrUtil.EMPTY:p.getSParamMissMemo()); part.put("sParamConfigValue",p.getSParamConfigValue()==null?StrUtil.EMPTY:p.getSParamConfigValue()); //获取动态参数 @@ -120,6 +121,7 @@ public class QuoService { part.put("iOrder", dynamic.getIOrder()); part.put("sParamConfigValue",dynamic.getSParamConfigValue()); part.put("sParamMissMemo", dynamic.getSParamMissMemo()); + part.put("sGroup",dynamic.getSGroup()); //获取动态参数 adddynamicData(sValue,dataAll, dynamic, finalArgsOld, sAll, part); partList.add(part); @@ -159,12 +161,13 @@ public class QuoService { List> dynamicData = new ArrayList<>(); dataParamDynamic.forEach(dynamic->{ Map dynamicOne = new HashMap<>(); - Object dynamicValue = getValue( p,finalArgsOld); + Object dynamicValue = getValue(dynamic,finalArgsOld); dynamicOne.put("sName",dynamic.getSParamValue()); dynamicOne.put("showName",dynamic.getSParam()); dynamicOne.put("bEmpty",dynamic.getBEmpty()); dynamicOne.put("sValue", dynamicValue); dynamicOne.put("iOrder", dynamic.getIOrder()); + dynamicOne.put("sGroup",dynamic.getSGroup()); dynamicOne.put("sParamMissMemo", dynamic.getSParamMissMemo()==null?StrUtil.EMPTY:dynamic.getSParamMissMemo()); dynamicOne.put("sParamConfigValue",dynamic.getSParamConfigValue()==null?StrUtil.EMPTY:dynamic.getSParamConfigValue()); //获取动态参数 diff --git a/src/main/java/com/xly/service/XlyErpService.java b/src/main/java/com/xly/service/XlyErpService.java index 4df521d..0f66589 100644 --- a/src/main/java/com/xly/service/XlyErpService.java +++ b/src/main/java/com/xly/service/XlyErpService.java @@ -422,7 +422,7 @@ public class XlyErpService { .sCopyToSrcId(session.getSCopyToSrcId()) .dbType(session.getDbType()) .dbCach(session.getDbCach()) - .sReturnType(sReturnType) + .sReturnType(isConfirmed?ReturnTypeCode.HTML.getCode():sReturnType) .build(); }else if(session.getCurrentScene()== null ){ return AiResponseDTO.builder().sSceneName(sceneName).sMethodName(methodName).aiText("当前场景:没有选择 退回当前场景 请输入 "+ CommonConstant.RESET + sResponMessage).dbType(session.getDbType()).dbCach(session.getDbCach()).sReturnType(sReturnType).build();