|
@@ -8,6 +8,7 @@ import com.fjhx.common.enums.FlowStatusEnum;
|
|
|
import com.fjhx.common.service.contract.ContractTemplateService;
|
|
|
import com.fjhx.common.service.corporation.CorporationService;
|
|
|
import com.fjhx.customer.service.customer.CustomerService;
|
|
|
+import com.fjhx.flow.service.flow.FlowExampleService;
|
|
|
import com.fjhx.item.service.product.ProductClassifyService;
|
|
|
import com.fjhx.item.service.product.ProductInfoService;
|
|
|
import com.fjhx.purchase.entity.purchase.vo.PurchaseDetailVo;
|
|
@@ -64,6 +65,9 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
|
|
|
@Autowired
|
|
|
private ContractTemplateService contractTemplateService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private FlowExampleService flowExampleService;
|
|
|
+
|
|
|
/**
|
|
|
* 分页
|
|
|
*
|
|
@@ -111,9 +115,12 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
|
|
|
item.setCorporationName(corporation.getName());
|
|
|
});
|
|
|
|
|
|
- //赋值业务员名称
|
|
|
+ // 赋值业务员名称
|
|
|
UserUtil.assignmentNickName(list, ContractProductVo::getSalesmanId, ContractProductVo::setUserName);
|
|
|
|
|
|
+ // 赋值流程id
|
|
|
+ flowExampleService.setFlowId(list, ContractProductVo::setFlowId);
|
|
|
+
|
|
|
return page;
|
|
|
}
|
|
|
|