This commit is contained in:
baozhipeng
2021-09-27 16:23:23 +08:00
parent eaa7fa0e5f
commit fd420bdf77
@@ -435,12 +435,12 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if(i==0){ if(i==0){
projectName.append(payCommonProject.getChargeProject()); projectName.append(payCommonProject.getChargeProject());
chargeCompanyName.append(payCommonProject.getChargeCompanyTemporaryName()); chargeCompanyName.append(payCommonProject.getChargeCompanyTemporaryName());
principalName.append(payCommonProject.getPrincipalId()); principalName.append(payCommonProject.getPrincipalName());
principalId.append(payCommonProject.getPrincipalId()); principalId.append(payCommonProject.getPrincipalId());
}else{ }else{
projectName.append(",").append(payCommonProject.getChargeProject()); projectName.append(",").append(payCommonProject.getChargeProject());
chargeCompanyName.append(",").append(payCommonProject.getChargeCompanyTemporaryName()); chargeCompanyName.append(",").append(payCommonProject.getChargeCompanyTemporaryName());
principalName.append(",").append(payCommonProject.getPrincipalId()); principalName.append(",").append(payCommonProject.getPrincipalName());
principalId.append(",").append(payCommonProject.getPrincipalId()); principalId.append(",").append(payCommonProject.getPrincipalId());
} }
break; break;
@@ -462,13 +462,13 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
if(i==0){ if(i==0){
projectName.append(payWorkingGroup.getWorkingGroupProject()); projectName.append(payWorkingGroup.getWorkingGroupProject());
chargeCompanyName.append(workingGroup.getChargeCompanyTemporaryName()); chargeCompanyName.append(workingGroup.getChargeCompanyTemporaryName());
principalName.append(workingGroup.getChargeCompanyTemporaryName()); principalName.append(payWorkingGroup.getPrincipalNameA());
principalId.append(payWorkingGroup.getPrincipalNameA()); principalId.append(payWorkingGroup.getPrincipalIdA());
}else{ }else{
projectName.append(",").append(payWorkingGroup.getWorkingGroupProject()); projectName.append(",").append(payWorkingGroup.getWorkingGroupProject());
chargeCompanyName.append(",").append(workingGroup.getChargeCompanyTemporaryName()); chargeCompanyName.append(",").append(workingGroup.getChargeCompanyTemporaryName());
principalName.append(",").append(workingGroup.getChargeCompanyTemporaryName()); principalName.append(",").append(payWorkingGroup.getPrincipalNameA());
principalId.append(",").append(payWorkingGroup.getPrincipalNameA()); principalId.append(",").append(payWorkingGroup.getPrincipalIdA());
} }
break; break;
//会议项目 //会议项目