|
|
@@ -1,13 +1,14 @@
|
|
|
package com.ydtech.modules.inv.service.impl;
|
|
|
|
|
|
-import com.alibaba.excel.annotation.format.DateTimeFormat;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.core.page.PageRequest;
|
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.inv.dao.InvAccountMapper;
|
|
|
-import com.ydtech.modules.inv.model.*;
|
|
|
+import com.ydtech.modules.inv.model.InvAccount;
|
|
|
+import com.ydtech.modules.inv.model.InvAccountOp;
|
|
|
+import com.ydtech.modules.inv.model.InvAccountProfit;
|
|
|
import com.ydtech.modules.inv.model.excel.AccountExcel;
|
|
|
import com.ydtech.modules.inv.model.vo.InvAccountQueryVo;
|
|
|
import com.ydtech.modules.inv.service.InvAccountOpService;
|
|
|
@@ -15,7 +16,6 @@ import com.ydtech.modules.inv.service.InvAccountProfitService;
|
|
|
import com.ydtech.modules.inv.service.InvAccountService;
|
|
|
import com.ydtech.modules.inv.utils.EasyExcelUtils;
|
|
|
import com.ydtech.modules.inv.utils.LocalDateTimeUtils;
|
|
|
-import net.sf.cglib.core.Local;
|
|
|
import org.joda.time.LocalDateTime;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
@@ -23,7 +23,6 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.io.File;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.time.LocalDate;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
@@ -83,11 +82,11 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
|
|
|
rel.setQuarterAmountExcess(new BigDecimal("300000").subtract(new BigDecimal("5000000").subtract(new BigDecimal(ord.getInvoicingAmountExcess()))).toString());
|
|
|
rel.setSumInvoicingAmount("0");
|
|
|
} else {
|
|
|
- if (!rel.getBusinessQuality().equals("0")&&rel.getOuterFlag().equals("0")) {
|
|
|
+ if (!rel.getBusinessQuality().equals("0") && rel.getOuterFlag().equals("0")) {
|
|
|
rel.setQuarterAmountExcess("300000");
|
|
|
}
|
|
|
rel.setSumInvoicingAmount("0");
|
|
|
- if (rel.getInvoicingAmountExcess() == null){
|
|
|
+ if (rel.getInvoicingAmountExcess() == null) {
|
|
|
rel.setInvoicingAmountExcess(rel.getInvoicingAmount());
|
|
|
}
|
|
|
}
|
|
|
@@ -199,11 +198,11 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
|
|
|
if (ord.getInvoicingAmountExcess() != null) {
|
|
|
rel.setQuarterAmountExcess(new BigDecimal("300000").subtract(new BigDecimal("5000000").subtract(new BigDecimal(ord.getInvoicingAmountExcess()))).toString());
|
|
|
} else {
|
|
|
- if (!rel.getBusinessQuality().equals("0")&&rel.getOuterFlag().equals("0")) {
|
|
|
+ if (!rel.getBusinessQuality().equals("0") && rel.getOuterFlag().equals("0")) {
|
|
|
rel.setQuarterAmountExcess("300000");
|
|
|
}
|
|
|
rel.setSumInvoicingAmount("0");
|
|
|
- if (rel.getInvoicingAmountExcess() == null){
|
|
|
+ if (rel.getInvoicingAmountExcess() == null) {
|
|
|
rel.setInvoicingAmountExcess(rel.getInvoicingAmount());
|
|
|
}
|
|
|
}
|