BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 2cb4c7ddb41917aef72de9d396d78ecc140ff65c

Authored by YunaiV
1 parent 0cd831d5

fix：修复工作流的发起时间未返回

Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/util/AiUtils.java
  View file @2cb4c7d
... ... @@ -64,7 +64,6 @@ public class AiUtils {
64 64 return OpenAiChatOptions.builder().model(model).temperature(temperature).maxTokens(maxTokens)
65 65 .toolNames(toolNames).toolContext(toolContext).build();
66 66 case AZURE_OPENAI:
67   - // TODO 芋艿：貌似没 model 字段？？？！
68 67 return AzureOpenAiChatOptions.builder().deploymentName(model).temperature(temperature).maxTokens(maxTokens)
69 68 .toolNames(toolNames).toolContext(toolContext).build();
70 69 case OLLAMA:
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
  View file @2cb4c7d
... ... @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.bpm.convert.task;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.map.MapUtil;
5   -import cn.iocoder.yudao.framework.common.core.KeyValue;
6 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 6 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  7 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
8 8 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
9 9 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
10 10 import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
... ... @@ -53,6 +53,7 @@ public interface BpmTaskConvert {
53 53 taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskRespVO.ProcessInstance.class));
54 54 AdminUserRespDTO startUser = userMap.get(NumberUtils.parseLong(processInstance.getStartUserId()));
55 55 taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, UserSimpleBaseVO.class));
  56 + taskVO.getProcessInstance().setCreateTime(DateUtils.of(processInstance.getStartTime()));
56 57 // 摘要
57 58 taskVO.getProcessInstance().setSummary(FlowableUtils.getSummary(processDefinitionInfoMap.get(processInstance.getProcessDefinitionId()),
58 59 processInstance.getProcessVariables()));
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @2cb4c7d
... ... @@ -395,7 +395,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
395 395  
396 396 // 3. 记录订单日志
397 397 TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus(),
398   - MapUtil.<String, Object>builder().put("deliveryName", express != null ? express.getName() : "")
  398 + MapUtil.<String, Object>builder().put("expressName", express != null ? express.getName() : "")
399 399 .put("logisticsNo", express != null ? deliveryReqVO.getLogisticsNo() : "").build());
400 400  
401 401 // 4.1 发送站内信
... ...