LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 工作组项目 手机端的联系人和网页端的联系人不一致

Browse Source
This commit is contained in:
lijiarao
2023-05-06 10:42:36 +08:00
parent 99359c346d
commit 123ea197fa
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+17 -4
View File
@@ -41,8 +41,10 @@ import com.jero.project.common.PayProjectCommon;
import com.jero.project.entity.PayCommonProject;
import com.jero.project.entity.PayCompanyCommonProject;
import com.jero.project.entity.PayWorkingGroupDistributionRecord;
import com.jero.project.entity.PayWorkingGroupSubItemContacts;
import com.jero.project.service.IPayCommonProjectService;
import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
import com.jero.project.vo.PayCommonProjectOutput;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -58,10 +60,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -101,6 +100,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
@Resource
private RolePermissionService rolePermissionService;
@Resource
private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
/**
* 分页列表查询
*
@@ -471,6 +472,18 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
});
payCommonProject.setFiles(sb.toString());
}
LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,id);
List<PayWorkingGroupSubItemContacts> pwg = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
if(!CollectionUtils.isEmpty(pwg)){
pwg.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum));
payCommonProject.setContactsTemporaryId(pwg.get(0).getContactsTemporaryId());
payCommonProject.setContactsTemporaryName(pwg.get(0).getContactsTemporaryName());
}else{
payCommonProject.setContactsTemporaryId("");
payCommonProject.setContactsTemporaryName("");
}
}
String strProject = JSON.toJSONString(payCommonProject);
payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);