瀏覽代碼

优化审批流&开发车辆显示

release_toaliyun_real
luozukai 7 年之前
父節點
當前提交
2418be9e44
共有 2 個檔案被更改,包括 25 行新增0 行删除
  1. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java
  2. +13
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxFlowRecord.java 查看文件

@@ -30,6 +30,10 @@ public class WxFlowRecord implements Serializable {
@Transient @Transient
protected List<Long> ids; protected List<Long> ids;


//是否最后一个启动节点
@Transient
private Integer isLastStart;

public WxFlowRecord(){} public WxFlowRecord(){}
public WxFlowRecord(Long businessId){ public WxFlowRecord(Long businessId){
this.businessId = businessId; this.businessId = businessId;
@@ -39,6 +43,14 @@ public class WxFlowRecord implements Serializable {
this.tenantId = tenantId; this.tenantId = tenantId;
} }


public Integer getIsLastStart() {
return isLastStart;
}

public void setIsLastStart(Integer isLastStart) {
this.isLastStart = isLastStart;
}

public List<Long> getIds() { public List<Long> getIds() {
return ids; return ids;
} }


+ 13
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java 查看文件

@@ -1,5 +1,7 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import com.alibaba.druid.support.json.JSONUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
@@ -191,10 +193,12 @@ public class WxFlowServiceImpl implements WxFlowService {
result.add(taskInfoMap); result.add(taskInfoMap);
} }
} }
PageHelper.startPage(pageNum, pageSize);
PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(result,pageSize); PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(result,pageSize);
return new ResultData(pageInfo); return new ResultData(pageInfo);
} }



@Override @Override
public ResultData applyHistory(Long businessId,String tenantId) { public ResultData applyHistory(Long businessId,String tenantId) {
List<WxFlowRecord> result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId)); List<WxFlowRecord> result = wxFlowRecordService.findList(new WxFlowRecord(businessId,tenantId));
@@ -214,7 +218,16 @@ public class WxFlowServiceImpl implements WxFlowService {
wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode()); wxFlowRecord.setStatus(EnumFlowRecordStatus.ASSIGNEE.getCode());
result.add(0,wxFlowRecord); result.add(0,wxFlowRecord);
} }

for (WxFlowRecord wxFlowRecord:result) {
if(wxFlowRecord.getStatus() == 1){
wxFlowRecord.setIsLastStart(1);
break;
}
}
} }


return new ResultData(result); return new ResultData(result);
} }




Loading…
取消
儲存