diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 5f9e3c79..a389024a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -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 queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,id); + List 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);