流程中创建时间

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@@ -591,7 +591,6 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             Map<String, Object> flowMap = f.getProcessVariables();
             Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
             String json = JSONObject.toJSONString(appMap);
-            System.out.println(json);
             AppVo appVo = new AppVo();
             appVo.setJson(json);
             //app版本的sid

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

@@ -30,9 +30,9 @@ import com.yxt.anrui.scm.api.scmvehinspectitem.*;
 import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmItemDetailVo;
 import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetail;
 import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetailVo;
-import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgDto;
 import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmItemImgVo;
 import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimg;
+import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgDto;
 import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgVo;
 import com.yxt.anrui.scm.biz.scmvehicleinspectitem.ScmVehicleInspectitemService;
 import com.yxt.anrui.scm.biz.scmvehinspectitemdetail.ScmVehinspectItemdetailService;
@@ -45,7 +45,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -239,8 +238,10 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
                 String sid = scmVehinspectItem.getSid();
                 BeanUtil.copyProperties(item, scmVehinspectItem);
                 scmVehinspectItem.setVehInspectSid(vehInspectSid);
-                if (!scmVehinspectItem.getIconUrl().contains(fileUploadComponent.getUrlPrefix())){
+                if(StringUtils.isNotBlank(scmVehinspectItem.getIconUrl())){
-                    scmVehinspectItem.setIconUrl(fileUploadComponent.getUrlPrefix()+scmVehinspectItem.getIconUrl());
+                    if (!scmVehinspectItem.getIconUrl().contains(fileUploadComponent.getUrlPrefix())){
+                        scmVehinspectItem.setIconUrl(fileUploadComponent.getUrlPrefix()+scmVehinspectItem.getIconUrl());
+                    }
                 }
                 baseMapper.insert(scmVehinspectItem);
                 List<ScmItemDetailVo> detailsList = item.getDetails();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.terminal.api.app.flowable;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,10 +28,14 @@ public class AppFlowableRecordVo implements Vo {
     @ApiModelProperty(value = "流程状态value")
     private String stateValue;
 
-    @ApiModelProperty(value = "办理时间")
+    @ApiModelProperty("接收时间")
-    private String time;
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "接收时间")
+    private Date createTime;
-    private String createTime;
+
+    @ApiModelProperty("办理时间")
+    @JsonProperty("time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date finishTime;
 
     @ApiModelProperty(value = "任务耗时")
     private String duration;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java

@@ -10,13 +10,15 @@ import java.util.List;
 @Data
 public class AppGressionDetailsVo implements Vo {
 
+    private static final long serialVersionUID = -2419006122141103302L;
     private String sid;
 
     @ApiModelProperty("任务id")
     private String taskId;
 
     @ApiModelProperty("流程实例id")
-    private String procInsId;
+    @JsonProperty("procInsId")
+    private String procInstId;
 
     @ApiModelProperty("用户sid")
     private String userSid;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java

@@ -16,7 +16,8 @@ public class AppGressionInfoVo implements Vo {
     private String taskId;
 
     @ApiModelProperty("流程实例id")
-    private String procInsId;
+    @JsonProperty("procInsId")
+    private String procInstId;
 
     @ApiModelProperty("用户sid")
     private String userSid;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -36,13 +36,14 @@ public class AppService {
         List<AppFlowableRecordVo> voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList());
         voList.removeAll(Collections.singleton(null));
         for (AppFlowableRecordVo vo : voList) {
-            String time = vo.getTime();
+            if (vo.getFinishTime() != null) {
-            if (StringUtils.isNotBlank(time)) {
                 AppFlowCommentVo commentVo = vo.getComment();
                 //类型
                 String type = commentVo.getType();
                 String comment = commentVo.getComment();
-                vo.setContent(comment);
+                if(StringUtils.isNotBlank(comment) ){
+                    vo.setContent(comment);
+                }
                 String stateValue = FlowComment.getRemarkByType(type);
                 if (StringUtils.isNotBlank(stateValue)) {
                     vo.setStateValue(stateValue);
@@ -50,10 +51,7 @@ public class AppService {
                 if (StringUtils.isNotBlank(type)) {
                     vo.setStateKey(type);
                 }
-                vo.setTime(sdf.format(new Date(Long.parseLong(time))));
             }
-
-            vo.setCreateTime(sdf.format(new Date(Long.parseLong(vo.getCreateTime()))));
         }
         return rb.success().setData(voList);
     }