|
|
|
@ -8,6 +8,7 @@ import com.xujie.modules.constants.FlowInstanceConstans; |
|
|
|
import com.xujie.modules.part.dao.PartMapper; |
|
|
|
import com.xujie.modules.part.entity.Part; |
|
|
|
import com.xujie.modules.part.service.Iface.IPartService; |
|
|
|
import com.xujie.modules.part.vo.PartVo; |
|
|
|
import com.xujie.modules.workFlow.data.ErfFlowInstanceData; |
|
|
|
import com.xujie.modules.workFlow.data.ErfFlowNodeInstanceData; |
|
|
|
import com.xujie.modules.workFlow.entity.ErfFlowInstance; |
|
|
|
@ -77,18 +78,20 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements IP |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageUtils myPage(Part data){ |
|
|
|
IPage<Part> resultList = baseMapper.myPage(new Page<Part>(data.getPage(), data.getLimit()), data); |
|
|
|
IPage<PartVo> resultList = baseMapper.myPage(new Page<PartVo>(data.getPage(), data.getLimit()), data); |
|
|
|
//加载流程数据 |
|
|
|
for (Part part : resultList.getRecords()) { |
|
|
|
for (PartVo partVo : resultList.getRecords()) { |
|
|
|
//加载流程数据 |
|
|
|
ErfFlowInstance erfFlowInstanceData = erfFlowInstanceMapper.getInstanceByOrderRef1(part.getPartNo(), part.getSite(), FlowInstanceConstans.PART_INFO); |
|
|
|
ErfFlowInstance erfFlowInstanceData = erfFlowInstanceMapper.getInstanceByOrderRef1(partVo.getPartNo(), partVo.getSite(), FlowInstanceConstans.PART_INFO); |
|
|
|
//待办(要求审批人和审批部门) |
|
|
|
ErfFlowNodeInstanceData nodeInstanceData = null; |
|
|
|
if(null != erfFlowInstanceData){ |
|
|
|
nodeInstanceData = erfFlowInstanceService.getWaitApproveNode(erfFlowInstanceData.getApplyNo(),part.getSite(),erfFlowInstanceData.getOrderType()); |
|
|
|
nodeInstanceData = erfFlowInstanceService.getWaitApproveNode(erfFlowInstanceData.getApplyNo(),partVo.getSite(),erfFlowInstanceData.getOrderType()); |
|
|
|
} |
|
|
|
part.setFlowStatus(erfFlowInstanceData.getStatus()); |
|
|
|
part.setFlowNodeInstanceData(nodeInstanceData); |
|
|
|
partVo.setApplyNo(erfFlowInstanceData.getApplyNo()); |
|
|
|
partVo.setOrderType(erfFlowInstanceData.getOrderType()); |
|
|
|
partVo.setFlowStatus(erfFlowInstanceData.getStatus()); |
|
|
|
partVo.setFlowNodeInstanceData(nodeInstanceData); |
|
|
|
} |
|
|
|
return new PageUtils(resultList); |
|
|
|
} |
|
|
|
|