Browse Source

产品列表返回流程单号和类型

master
yanyan 8 months ago
parent
commit
aafae1a80c
  1. 3
      src/main/java/com/xujie/modules/part/dao/PartMapper.java
  2. 10
      src/main/java/com/xujie/modules/part/entity/Part.java
  3. 15
      src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java
  4. 18
      src/main/java/com/xujie/modules/part/vo/PartVo.java
  5. 2
      src/main/resources/mapper/part/mapperXml/PartMapper.xml

3
src/main/java/com/xujie/modules/part/dao/PartMapper.java

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xujie.modules.base.data.PartSubPropertiesValueData;
import com.xujie.modules.base.data.PlmPropertiesItemAvailableData;
import com.xujie.modules.part.entity.Part;
import com.xujie.modules.part.vo.PartVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -24,7 +25,7 @@ public interface PartMapper extends BaseMapper<Part> {
List<Part> getListByModel(Part data);
IPage<Part> myPage(Page<Part> page, @Param("query") Part data);
IPage<PartVo> myPage(Page<PartVo> page, @Param("query") Part data);
List<PlmPropertiesItemAvailableData> getAvailableValueList(PartSubPropertiesValueData partSubPropertiesValueData);
}

10
src/main/java/com/xujie/modules/part/entity/Part.java

@ -91,16 +91,6 @@ public class Part extends QueryPage {
private Integer id;
/**
* 流程实例
* @return
*/
@ApiModelProperty(value = "流程实例")
private ErfFlowNodeInstanceData flowNodeInstanceData;
@ApiModelProperty(value = "审批状态")
private String flowStatus;
public Object getKey() {
return this.id;
}

15
src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java

@ -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);
}

18
src/main/java/com/xujie/modules/part/vo/PartVo.java

@ -2,6 +2,7 @@ package com.xujie.modules.part.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xujie.common.utils.QueryPage;
import com.xujie.modules.workFlow.data.ErfFlowNodeInstanceData;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -82,6 +83,23 @@ public class PartVo extends QueryPage {
private Integer id;
/**
* 流程实例
* @return
*/
@ApiModelProperty(value = "流程实例")
private ErfFlowNodeInstanceData flowNodeInstanceData;
@ApiModelProperty(value = "审批状态")
private String flowStatus;
@ApiModelProperty(value = "流程单号")
private String applyNo;
@ApiModelProperty(value = "审批类型")
private String orderType;
public Object getKey() {
return this.id;
}

2
src/main/resources/mapper/part/mapperXml/PartMapper.xml

@ -56,7 +56,7 @@
ORDER BY id
</select>
<select id="myPage" resultType="com.xujie.modules.part.entity.Part">
<select id="myPage" resultType="com.xujie.modules.part.vo.PartVo">
select
<include refid="BaseColumnList"/>
from part

Loading…
Cancel
Save