移动端移库流程相关接口

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.portal.api.flow.app;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,4 +34,7 @@ public class FlowTaskDoVo implements Vo {
     private AppVo appVariables;
     @JsonIgnore
     private Map<String,Object> processVariables;
+    @ApiModelProperty("办理的url")
+    @JsonIgnore
+    private SysProUrlVo sysProUrlVo ;
 }

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

@@ -37,7 +37,6 @@ 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.sysprourl.SysProUrlVo;
 import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery;
@@ -493,12 +492,15 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
         }
         taskQuery.setFields(taskParamList);
         taskQueryPagerQuery.setParams(taskQuery);
-        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
+//        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
+        ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg("流程错误");
+        }
         PagerVo<FlowTaskDoVo> page = new PagerVo<>();
         List<FlowTaskDoVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDoVo.class)).collect(Collectors.toList());
         voList.removeAll(Collections.singleton(null));
         Map<String, List<Integer>> appVer = new HashMap<>();
-        Map<String, List<Integer>> jsonMap = new HashMap<>();
         for (int i = 0; i < voList.size(); i++) {
             FlowTaskDoVo f = voList.get(i);
             Map<String, Object> flowMap = f.getProcessVariables();
@@ -507,17 +509,23 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
             System.out.println(json);
             //根据节点id和流程定义id以及类型查询地址以及版本号等：待定，需要流程返回。
             //========================================================================
-            String procDefId = f.getProcDefId();
-            String taskDefKey = f.getTaskDefKey();
-            ResultBean<SysProUrlVo> resultBean1 = sysProUrlFeign.selectUrlByKey(procDefId, taskDefKey, "1","2");
+//            String procDefId = f.getProcDefId();
+//            String taskDefKey = f.getTaskDefKey();
+//            ResultBean<SysProUrlVo> resultBean1 = sysProUrlFeign.selectUrlByKey(procDefId, taskDefKey, "1","2");
             //========================================================================
             AppVo appVo = new AppVo();
             appVo.setJson(json);
-            String appSid = "";//app版本的sid
-            String type = "";//app版本的类型
-            if (resultBean1.getData() != null) {
+            //app版本的sid
+            String appSid = "";
+            //app版本的类型
+            String type = "";
+           /* if (resultBean1.getData() != null) {
                 appVo.setModuleAction(resultBean1.getData().getUrl());
                 appSid = resultBean1.getData().getModulePluginName();
+            }*/
+            if(f.getSysProUrlVo() != null){
+                appVo.setModuleAction(f.getSysProUrlVo().getUrl());
+                appSid = f.getSysProUrlVo().getModulePluginName();
             }
             //根据appSid查询最新版本的app插件包:以及类型：2插件，1框架
             if (StringUtils.isNotBlank(appSid)) {

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionDto.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -51,44 +52,47 @@ import java.util.List;
 @ApiModel(value = "移位单 数据传输对象", description = "移位单 数据传输对象")
 public class AppScmVehicleGressionDto implements Dto {
 
-    private String sid; // sid
-    private String userSid; // userSid
+    private static final long serialVersionUID = -5753948406322577902L;
+    private String sid;
+    private String userSid;
     @ApiModelProperty("车辆sid")
-    private String vehicleSid; // 车辆sid
+    private String vehicleSid;
     @ApiModelProperty("车架号")
-    private String vinNo; // 车架号
+    private String vinNo;
     @ApiModelProperty("申请编号")
-    private String applicantNo; // 申请编号
+    private String applicantNo;
     @ApiModelProperty("申请人")
-    private String applicantName; // 申请人
+    private String applicantName;
     @ApiModelProperty("申请日期")
-    private String applicantDate; // 申请日期
+    private String applicantDate;
     @ApiModelProperty("现存地点")
-    private String location; // 现存地点
+    private String location;
     @ApiModelProperty("现存放地点")
     private String locationKey;
     @ApiModelProperty("现存放地点sid")
     private String locationSid;
     @ApiModelProperty("目标地点")
-    private String targetLocation; // 目标地点
+    private String targetLocation;
     @ApiModelProperty("目标库")
     private String targetLocationKey;
     @ApiModelProperty("目标库sid")
     private String targetLocationSid;
     @ApiModelProperty("变更原因")
-    private String changeReason; // 变更原因
-    @ApiModelProperty("申请经费")
-    private String applicantFunds; // 申请经费
+    private String changeReason;
+    @ApiModelProperty(value = "申请经费")
+    private String applicantFunds;
     @ApiModelProperty("经办人")
-    private String operator; // 经办人
+    @NotBlank(message = "经办人不能为空")
+    private String operator;
     @ApiModelProperty("保险状态")
     @JsonProperty("InsuranceState")
-    private String InsuranceState; // 保险状态
+    @NotBlank(message = "保险状态不能为空")
+    private String InsuranceState;
     @ApiModelProperty("保险状态")
     @JsonProperty("InsuranceStateKey")
-    private String InsuranceStateKey; // 保险状态
+    private String InsuranceStateKey;
     @ApiModelProperty("临牌")
-    private String temporaryCard; // 临牌
+    private String temporaryCard;
     @ApiModelProperty("保单照片")
     private List<String> policyImage;