|
@@ -91,6 +91,12 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
List<PaymentManagement> dataList = baseMapper.getListByCondition(pageView);
|
|
List<PaymentManagement> dataList = baseMapper.getListByCondition(pageView);
|
|
if (!CollectionUtils.isEmpty(dataList)) {
|
|
if (!CollectionUtils.isEmpty(dataList)) {
|
|
dataList.forEach(paymentManagement1 -> {
|
|
dataList.forEach(paymentManagement1 -> {
|
|
|
|
+ CommonCompany commonCompany=commonCompanyService.selectOne(new EntityWrapper<CommonCompany>()
|
|
|
|
+ .eq("comp_id",paymentManagement1.getCompId()));
|
|
|
|
+ //公司名
|
|
|
|
+ if (commonCompany!=null){
|
|
|
|
+ paymentManagement1.setCompName(commonCompany.getCompName());
|
|
|
|
+ }
|
|
String taskId = "";
|
|
String taskId = "";
|
|
// 只有待审核状态才有taskId
|
|
// 只有待审核状态才有taskId
|
|
if (StringUtils.isNotBlank(paymentManagement1.getWorkflowId())) {
|
|
if (StringUtils.isNotBlank(paymentManagement1.getWorkflowId())) {
|