工作组变更

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java

@@ -48,10 +48,12 @@ import com.jero.modules.system.service.ISysUserService;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
+import com.jero.project.entity.PayWorkingGroupSubItemContacts;
 import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import com.jero.project.service.IPayWorkingGroupService;
+import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -66,7 +68,10 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -129,6 +134,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private IPayMemberProjectService memberProjectService;
     @Resource
     private ITbCertificatePaymentService certificatePaymentService;
+    @Resource
+    private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
 
 
     @Override
@@ -289,20 +296,15 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                         if(Objects.isNull(payWorkingGroup)){
                             throw new JeroBootException("工作组不存在！");
                         }
-                        PayContactsManagementTemporary payWorkingTemporaryOne = payContactsManagementTemporaryService.getById(payWorking.getContactsTemporaryIdOne());
+
-                        if(!Objects.isNull(payWorkingTemporaryOne)){
+                        LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
-                            listId.add(payWorkingTemporaryOne);
+                        queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorking.getId());
-                        }
+                        List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
-                        if(!StringUtils.isBlank(payWorking.getContactsTemporaryIdTwo())){
+                        if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){
-                            PayContactsManagementTemporary payWorkingTemporaryTwo = payContactsManagementTemporaryService.getById(payWorking.getContactsTemporaryIdTwo());
+                            List<String> listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
-                            if(!Objects.isNull(payWorkingTemporaryTwo)){
+                            List<PayContactsManagementTemporary> payWorkingTemporary = payContactsManagementTemporaryService.listByIds(listIds);
-                                listId.add(payWorkingTemporaryTwo);
+                            if(!CollectionUtils.isEmpty(payWorkingTemporary)){
-                            }
+                                listId.addAll(payWorkingTemporary);
-                        }
-                        if(!StringUtils.isBlank(payWorking.getContactsTemporaryIdThree())){
-                            PayContactsManagementTemporary payWorkingTemporaryThree = payContactsManagementTemporaryService.getById(payWorking.getContactsTemporaryIdThree());
-                            if(!Objects.isNull(payWorkingTemporaryThree)){
-                                listId.add(payWorkingTemporaryThree);
                             }
                         }
                         project = payWorkingGroup.getWorkingGroupProject();

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java

@@ -17,6 +17,7 @@ import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.company.entity.PayCompanyManagement;
@@ -48,15 +49,14 @@ import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
+import com.jero.project.entity.PayWorkingGroupSubItemContacts;
 import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
-import com.jero.common.util.AuthenticationUtils;
 import com.jero.project.service.IPayWorkingGroupService;
+import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
 import com.jero.project.vo.PayCommonProjectOutput;
 import com.jero.standards.memberinfo.entity.MemberInfo;
-import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
-import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -66,12 +66,12 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.servlet.ModelAndView;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -122,10 +122,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
     private ITbMemberProjectService tbMemberProjectService;
     @Resource
     private TbCertificatePaymentMapper certificatePaymentMapper;
-    @Autowired
+    @Resource
     private IPayPaymentCheckService payPaymentCheckService;
     @Resource
     private IPayCompanyManagementService payCompanyManagementService;
+    @Resource
+    private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
 
     @Value("${jero.path.upload}")
     private String upLoadPath;
@@ -335,7 +337,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      * @param checkOrRecord check:企业端走审核流程来款，record:管理端直接来款
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = JeroBootException.class)
     public void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List<TbCheckVo> typr5List,List<TbCheckVo> typr6List,Integer flag,String checkOrRecord){
 
         BigDecimal newPaidAmount;
@@ -375,24 +377,16 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 break;
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
-
                 PayWorkingGroupSubItem payWorking = payWorkingGroupSubItemMapper.selectById(payPaymentRecord.getProjectId());
                 PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorking.getWorkingGroupId());
-
+                LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
-                PayContactsManagementTemporary payWorkingTemporaryOne = payContactsManagementTemporaryService.getById(payWorking.getContactsTemporaryIdOne());
+                queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorking.getId());
-                if(!Objects.isNull(payWorkingTemporaryOne)){
+                List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
-                    listId.add(payWorkingTemporaryOne);
+                if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){
-                }
+                    List<String> listIds = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList());
-                if(!StringUtils.isBlank(payWorking.getContactsTemporaryIdTwo())){
+                    List<PayContactsManagementTemporary> payWorkingTemporary = payContactsManagementTemporaryService.listByIds(listIds);
-                    PayContactsManagementTemporary payWorkingTemporaryTwo = payContactsManagementTemporaryService.getById(payWorking.getContactsTemporaryIdTwo());
+                    if(!CollectionUtils.isEmpty(payWorkingTemporary)){
-                    if(!Objects.isNull(payWorkingTemporaryTwo)){
+                        listId.addAll(payWorkingTemporary);
-                        listId.add(payWorkingTemporaryTwo);
-                    }
-                }
-                if(!StringUtils.isBlank(payWorking.getContactsTemporaryIdThree())){
-                    PayContactsManagementTemporary payWorkingTemporaryThree = payContactsManagementTemporaryService.getById(payWorking.getContactsTemporaryIdThree());
-                    if(!Objects.isNull(payWorkingTemporaryThree)){
-                        listId.add(payWorkingTemporaryThree);
                     }
                 }
                 principalId = payWorkingGroup.getPrincipalIdA();