|
@@ -9,7 +9,9 @@ import com.fjhx.common.entity.corporation.po.Corporation;
|
|
|
import com.fjhx.common.service.corporation.CorporationService;
|
|
|
import com.fjhx.common.utils.Assert;
|
|
|
import com.fjhx.customer.service.customer.CustomerService;
|
|
|
+import com.fjhx.flow.service.flow.FlowExampleService;
|
|
|
import com.fjhx.sale.entity.contract.vo.ContractPdfInfoVo;
|
|
|
+import com.fjhx.sale.entity.contract.vo.ContractVo;
|
|
|
import com.fjhx.sale.entity.documents.po.Documents;
|
|
|
import com.fjhx.sale.entity.intermediate.dto.IntermediateContractDto;
|
|
|
import com.fjhx.sale.entity.intermediate.dto.IntermediateContractSelectDto;
|
|
@@ -32,6 +34,7 @@ import org.springframework.stereotype.Service;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
@@ -54,6 +57,8 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
|
|
|
private CustomerService customerService;
|
|
|
@Autowired
|
|
|
private CorporationService corporationService;
|
|
|
+ @Autowired
|
|
|
+ private FlowExampleService flowExampleService;
|
|
|
|
|
|
@Override
|
|
|
public Page<IntermediateContractVo> getPage(IntermediateContractSelectDto dto) {
|
|
@@ -88,6 +93,9 @@ public class IntermediateContractServiceImpl extends ServiceImpl<IntermediateCon
|
|
|
corporationService.attributeAssign(records, IntermediateContractVo::getSellCorporationId, (item, corporation) -> {
|
|
|
item.setSellCorporationName(corporation.getName());
|
|
|
});
|
|
|
+ // 赋值流程id
|
|
|
+ List<IntermediateContractVo> collect = records.stream().filter(item -> Objects.isNull(item.getFlowId())).collect(Collectors.toList());
|
|
|
+ flowExampleService.setFlowId(collect, IntermediateContractVo::setFlowId);
|
|
|
UserUtil.assignmentNickName(records, IntermediateContractVo::getCreateUser, IntermediateContractVo::setUserName);
|
|
|
return page;
|
|
|
}
|