diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java index ec5c7920ae..0e1a35ce62 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java @@ -1,11 +1,13 @@ package com.yxt.anrui.portal.api.flow.app; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.Map; /** @@ -25,11 +27,11 @@ public class FlowTaskDoVo implements Vo { @ApiModelProperty(value = "工作名称") private String procDefName; @ApiModelProperty(value = "提交日期") - private String processCreateTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date processCreateTime; @ApiModelProperty(value = "发起日期") - private String createTime; - // @JsonProperty("deployId") -// private String procDefId; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTime; @ApiModelProperty(value = "流程id") private String deployId; @ApiModelProperty(value = "流程实例id") diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java index 41b7a553a1..87580b1ee7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java @@ -29,16 +29,13 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeign; import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionFeignBusinessStartDTO; import com.yxt.anrui.flowable.api.flowtask.FlowTaskDto; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; -import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; -import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -61,7 +58,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -504,11 +500,8 @@ public class FlowableService extends MybatisBaseService> appVer = new HashMap<>(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); for (int i = 0; i < voList.size(); i++) { FlowTaskDoVo f = voList.get(i); - f.setCreateTime(sdf.format(new Date(Long.parseLong(f.getCreateTime())))); - f.setProcessCreateTime(sdf.format(new Date(Long.parseLong(f.getProcessCreateTime())))); Map flowMap = f.getProcessVariables(); Map appMap = ConstantUtils.getMap(flowMap, "app"); String json = JSONObject.toJSONString(appMap);