|
@@ -51,6 +51,9 @@ public class FlowContractInvoiceService {
|
|
|
@Autowired
|
|
|
ProjectAmountService projectAmountService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ ProjectTypeService projectTypeService;
|
|
|
+
|
|
|
@Autowired
|
|
|
ContractInvoiceMapper contractInvoiceMapper;
|
|
|
|
|
@@ -121,6 +124,16 @@ public class FlowContractInvoiceService {
|
|
|
if (contract != null) {
|
|
|
if (StringUtils.isNotBlank(contract.getProjectId())) {
|
|
|
Project project = projectService.selectById(contract.getProjectId());
|
|
|
+ if(StringUtils.isNotBlank(project.getProjectTypeId())) {
|
|
|
+ List<ProjectType> parents = projectTypeService.selectParents(project.getProjectTypeId());
|
|
|
+ if(!parents.isEmpty()) {
|
|
|
+ StringBuilder projectTypeName = new StringBuilder(parents.get(0).getName());
|
|
|
+ for (int i = 1; i < parents.size(); i++) {
|
|
|
+ projectTypeName.append("-").append(parents.get(i).getName());
|
|
|
+ }
|
|
|
+ project.setProjectTypeName(projectTypeName.toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
map.put("project", project);
|
|
|
ProjectAmount projectAmount = projectAmountService.selectById(contract.getProjectId());
|
|
|
if (projectAmount != null) {
|