修改bug#40797
This commit is contained in:
+7
-2
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.common.ProjectCommon;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.service.ProjectDetailService;
|
||||
import com.jero.common.util.AuthenticationUtils;
|
||||
import com.jero.common.util.PasswordUtil;
|
||||
import com.jero.company.entity.PayCompanyManagement;
|
||||
@@ -41,6 +42,7 @@ import com.jero.member.mapper.PayMemberProjectSubitemMapper;
|
||||
import com.jero.member.mapper.TbMemberProjectMapper;
|
||||
import com.jero.member.mapper.TbMemberProjectSubitemMapper;
|
||||
import com.jero.payment.entity.PayPaymentRecord;
|
||||
import com.jero.payment.service.IPayPaymentRecordService;
|
||||
import com.jero.project.entity.PayCommonProject;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
@@ -53,6 +55,7 @@ import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.math.BigDecimal;
|
||||
@@ -99,11 +102,13 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
|
||||
@Resource
|
||||
private PayMailBillProjectMapper payMailBillProjectMapper;
|
||||
@Resource
|
||||
PayCompanyManagementMapper payCompanyManagementMapper;
|
||||
private ProjectDetailService projectDetailService;
|
||||
@Resource
|
||||
private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
|
||||
@Resource
|
||||
private IPayCompanyManagementService payCompanyManagementService;
|
||||
@Resource
|
||||
private IPayPaymentRecordService payPaymentRecordService;
|
||||
|
||||
|
||||
@Override
|
||||
@@ -136,6 +141,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
|
||||
* @param payMailBill
|
||||
* @return
|
||||
*/
|
||||
@Transactional
|
||||
public Result<?> addPayBill(PayMailBillVO payMailBill) {
|
||||
//票据关联项目表
|
||||
List<PayMailBillProject> bmpList = payMailBill.getBmpList();
|
||||
@@ -146,7 +152,6 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
|
||||
return Result.error(res);
|
||||
}
|
||||
|
||||
|
||||
for (int i = 0; i < bmpList.size(); i++) {
|
||||
PayMailBillProject payMailBillProject = bmpList.get(i);
|
||||
if (PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(payMailBillProject.getProjectType()))) {
|
||||
|
||||
+1
@@ -116,6 +116,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
* @param payPaymentRecord
|
||||
*/
|
||||
@Override
|
||||
@Transactional
|
||||
public void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List<TbCheckVo> typr5List){
|
||||
|
||||
BigDecimal receivableAmount;
|
||||
|
||||
Reference in New Issue
Block a user