|
|
|
@ -54,7 +54,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.web.multipart.MultipartFile; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.io.File; |
|
|
|
@ -149,11 +148,60 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPalceGenDate())) { |
|
|
|
qw.eq("palceGenDate", query.getPalceGenDate()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWithholdingDate())) { |
|
|
|
String[] w = query.getWithholdingDate().split("-"); |
|
|
|
String withholdingDate = w[0] + "年" + Integer.parseInt(w[1]) + "月"; |
|
|
|
qw.eq("withholdingDate", withholdingDate); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUploadState())) { |
|
|
|
if (query.getUploadState().equals("0")) { |
|
|
|
qw.and(wrapper -> wrapper.eq("uploadDate", "") |
|
|
|
.or().isNull("uploadDate") |
|
|
|
); |
|
|
|
} else { |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsAdjustment())) { |
|
|
|
qw.eq("isAdjustment", query.getIsAdjustment()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsUploadFinish())) { |
|
|
|
if (query.getIsUploadFinish().equals("1")) { |
|
|
|
qw.eq("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} else { |
|
|
|
qw.ne("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOnceCheckState())) { |
|
|
|
qw.eq("onceCheckState", query.getOnceCheckState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSecondUploadState())) { |
|
|
|
if (query.getSecondUploadState().equals("1")) { |
|
|
|
qw.isNotNull("secondaryUploadMoney"); |
|
|
|
qw.ne("secondaryUploadMoney", ""); |
|
|
|
qw.ne("secondaryUploadMoney", 0); |
|
|
|
qw.eq("isAdjustment", "是"); |
|
|
|
} else { |
|
|
|
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", "")); |
|
|
|
} |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String uploadStartDate = query.getUploadStartDate(); |
|
|
|
String uploadEndDate = query.getUploadEndDate(); |
|
|
|
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"). |
|
|
|
or(). |
|
|
|
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
@ -161,6 +209,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if ("001".equals(record.getCalculationModeKey())) { |
|
|
|
record.setCalculationStandard(record.getCalculationStandard() + "%"); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) { |
|
|
|
if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) { |
|
|
|
record.setSecondCheckState("是"); |
|
|
|
} else { |
|
|
|
record.setSecondCheckState("否"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
record.setSecondCheckState("否"); |
|
|
|
} |
|
|
|
} |
|
|
|
PagerVo<ScmVehRebateVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
@ -232,11 +289,60 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPalceGenDate())) { |
|
|
|
qw.eq("palceGenDate", query.getPalceGenDate()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWithholdingDate())) { |
|
|
|
String[] w = query.getWithholdingDate().split("-"); |
|
|
|
String withholdingDate = w[0] + "年" + Integer.parseInt(w[1]) + "月"; |
|
|
|
qw.eq("withholdingDate", withholdingDate); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUploadState())) { |
|
|
|
if (query.getUploadState().equals("0")) { |
|
|
|
qw.and(wrapper -> wrapper.eq("uploadDate", "") |
|
|
|
.or().isNull("uploadDate") |
|
|
|
); |
|
|
|
} else { |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsAdjustment())) { |
|
|
|
qw.eq("isAdjustment", query.getIsAdjustment()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsUploadFinish())) { |
|
|
|
if (query.getIsUploadFinish().equals("1")) { |
|
|
|
qw.eq("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} else { |
|
|
|
qw.ne("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOnceCheckState())) { |
|
|
|
qw.eq("onceCheckState", query.getOnceCheckState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSecondUploadState())) { |
|
|
|
if (query.getSecondUploadState().equals("1")) { |
|
|
|
qw.isNotNull("secondaryUploadMoney"); |
|
|
|
qw.ne("secondaryUploadMoney", ""); |
|
|
|
qw.ne("secondaryUploadMoney", 0); |
|
|
|
qw.eq("isAdjustment", "是"); |
|
|
|
} else { |
|
|
|
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", "")); |
|
|
|
} |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String uploadStartDate = query.getUploadStartDate(); |
|
|
|
String uploadEndDate = query.getUploadEndDate(); |
|
|
|
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"). |
|
|
|
or(). |
|
|
|
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
List<ScmVehRebateVo> scmVehRebateVoList = baseMapper.listAll(qw); |
|
|
|
for (ScmVehRebateVo record : scmVehRebateVoList) { |
|
|
|
@ -327,6 +433,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
return p; |
|
|
|
} |
|
|
|
} |
|
|
|
qw.eq("state", 2); |
|
|
|
qw.eq("adjustmentState", 0); |
|
|
|
if (StringUtils.isNotBlank(query.getBrandName())) { |
|
|
|
qw.like("brandName", query.getBrandName()); |
|
|
|
} |
|
|
|
@ -342,19 +450,69 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getRebateName())) { |
|
|
|
qw.like("rebateName", query.getRebateName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getState())) { |
|
|
|
qw.eq("state", query.getState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.like("useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPalceGenDate())) { |
|
|
|
qw.eq("palceGenDate", query.getPalceGenDate()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWithholdingDate())) { |
|
|
|
String[] w = query.getWithholdingDate().split("-"); |
|
|
|
String withholdingDate = w[0] + "年" + Integer.parseInt(w[1]) + "月"; |
|
|
|
qw.eq("withholdingDate", withholdingDate); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUploadState())) { |
|
|
|
if (query.getUploadState().equals("0")) { |
|
|
|
qw.and(wrapper -> wrapper.eq("uploadDate", "") |
|
|
|
.or().isNull("uploadDate") |
|
|
|
); |
|
|
|
} else { |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsAdjustment())) { |
|
|
|
qw.eq("isAdjustment", query.getIsAdjustment()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsUploadFinish())) { |
|
|
|
if (query.getIsUploadFinish().equals("1")) { |
|
|
|
qw.eq("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} else { |
|
|
|
qw.ne("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOnceCheckState())) { |
|
|
|
qw.eq("onceCheckState", query.getOnceCheckState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSecondUploadState())) { |
|
|
|
if (query.getSecondUploadState().equals("1")) { |
|
|
|
qw.isNotNull("secondaryUploadMoney"); |
|
|
|
qw.ne("secondaryUploadMoney", ""); |
|
|
|
qw.ne("secondaryUploadMoney", 0); |
|
|
|
qw.eq("isAdjustment", "是"); |
|
|
|
} else { |
|
|
|
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", "")); |
|
|
|
} |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.eq("state", 2); |
|
|
|
qw.eq("adjustmentState", 0); |
|
|
|
String uploadStartDate = query.getUploadStartDate(); |
|
|
|
String uploadEndDate = query.getUploadEndDate(); |
|
|
|
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"). |
|
|
|
or(). |
|
|
|
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
@ -412,6 +570,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
return p; |
|
|
|
} |
|
|
|
} |
|
|
|
qw.eq("state", 2); |
|
|
|
qw.eq("adjustmentState", 0); |
|
|
|
if (StringUtils.isNotBlank(query.getBrandName())) { |
|
|
|
qw.like("brandName", query.getBrandName()); |
|
|
|
} |
|
|
|
@ -427,19 +587,69 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getRebateName())) { |
|
|
|
qw.like("rebateName", query.getRebateName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getState())) { |
|
|
|
qw.eq("state", query.getState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.like("useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPalceGenDate())) { |
|
|
|
qw.eq("palceGenDate", query.getPalceGenDate()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWithholdingDate())) { |
|
|
|
String[] w = query.getWithholdingDate().split("-"); |
|
|
|
String withholdingDate = w[0] + "年" + Integer.parseInt(w[1]) + "月"; |
|
|
|
qw.eq("withholdingDate", withholdingDate); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUploadState())) { |
|
|
|
if (query.getUploadState().equals("0")) { |
|
|
|
qw.and(wrapper -> wrapper.eq("uploadDate", "") |
|
|
|
.or().isNull("uploadDate") |
|
|
|
); |
|
|
|
} else { |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsAdjustment())) { |
|
|
|
qw.eq("isAdjustment", query.getIsAdjustment()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsUploadFinish())) { |
|
|
|
if (query.getIsUploadFinish().equals("1")) { |
|
|
|
qw.eq("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} else { |
|
|
|
qw.ne("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOnceCheckState())) { |
|
|
|
qw.eq("onceCheckState", query.getOnceCheckState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSecondUploadState())) { |
|
|
|
if (query.getSecondUploadState().equals("1")) { |
|
|
|
qw.isNotNull("secondaryUploadMoney"); |
|
|
|
qw.ne("secondaryUploadMoney", ""); |
|
|
|
qw.ne("secondaryUploadMoney", 0); |
|
|
|
qw.eq("isAdjustment", "是"); |
|
|
|
} else { |
|
|
|
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", "")); |
|
|
|
} |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.eq("state", 2); |
|
|
|
qw.eq("adjustmentState", 0); |
|
|
|
String uploadStartDate = query.getUploadStartDate(); |
|
|
|
String uploadEndDate = query.getUploadEndDate(); |
|
|
|
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"). |
|
|
|
or(). |
|
|
|
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
List<ScmVehRebateVo> scmVehRebateVoList = baseMapper.checkApplyGetVehRebateAll(qw); |
|
|
|
for (ScmVehRebateVo record : scmVehRebateVoList) { |
|
|
|
@ -449,6 +659,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
} else {//上传状态：已上传
|
|
|
|
record.setUploadState("1"); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(record.getSecondaryUploadMoney())) { |
|
|
|
if (new BigDecimal(record.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 1 && "是".equals(record.getIsAdjustment())) { |
|
|
|
record.setSecondCheckState("是"); |
|
|
|
} else { |
|
|
|
record.setSecondCheckState("否"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
record.setSecondCheckState("否"); |
|
|
|
} |
|
|
|
} |
|
|
|
return scmVehRebateVoList; |
|
|
|
} |
|
|
|
@ -498,12 +717,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getBrandName())) { |
|
|
|
qw.like("brandName", query.getBrandName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.like("useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVehModelName())) { |
|
|
|
qw.like("vehModelName", query.getVehModelName()); |
|
|
|
} |
|
|
|
@ -516,17 +729,75 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getRebateName())) { |
|
|
|
qw.like("rebateName", query.getRebateName()); |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
if (StringUtils.isNotBlank(query.getState())) { |
|
|
|
qw.eq("state", query.getState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.like("useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
qw.eq("adjustmentState", 0); |
|
|
|
qw.eq("state", 2); |
|
|
|
qw.eq("onceCheckState", 0); |
|
|
|
qw.and(wrapper -> wrapper.eq("uploadDate", "") |
|
|
|
.or().isNull("uploadDate") |
|
|
|
); |
|
|
|
if (StringUtils.isNotBlank(query.getPalceGenDate())) { |
|
|
|
qw.eq("palceGenDate", query.getPalceGenDate()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWithholdingDate())) { |
|
|
|
String[] w = query.getWithholdingDate().split("-"); |
|
|
|
String withholdingDate = w[0] + "年" + Integer.parseInt(w[1]) + "月"; |
|
|
|
qw.eq("withholdingDate", withholdingDate); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUploadState())) { |
|
|
|
if (query.getUploadState().equals("0")) { |
|
|
|
qw.and(wrapper -> wrapper.eq("uploadDate", "") |
|
|
|
.or().isNull("uploadDate") |
|
|
|
); |
|
|
|
} else { |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsAdjustment())) { |
|
|
|
qw.eq("isAdjustment", query.getIsAdjustment()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsUploadFinish())) { |
|
|
|
if (query.getIsUploadFinish().equals("1")) { |
|
|
|
qw.eq("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} else { |
|
|
|
qw.ne("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOnceCheckState())) { |
|
|
|
qw.eq("onceCheckState", query.getOnceCheckState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSecondUploadState())) { |
|
|
|
if (query.getSecondUploadState().equals("1")) { |
|
|
|
qw.isNotNull("secondaryUploadMoney"); |
|
|
|
qw.ne("secondaryUploadMoney", ""); |
|
|
|
qw.ne("secondaryUploadMoney", 0); |
|
|
|
qw.eq("isAdjustment", "是"); |
|
|
|
} else { |
|
|
|
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", "")); |
|
|
|
} |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String uploadStartDate = query.getUploadStartDate(); |
|
|
|
String uploadEndDate = query.getUploadEndDate(); |
|
|
|
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"). |
|
|
|
or(). |
|
|
|
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
List<OneExcelVo> oneExcelVos = baseMapper.excelListOne(qw); |
|
|
|
for (OneExcelVo oneExcelVo : oneExcelVos) { |
|
|
|
@ -580,12 +851,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getBrandName())) { |
|
|
|
qw.like("brandName", query.getBrandName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.like("useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVehModelName())) { |
|
|
|
qw.like("vehModelName", query.getVehModelName()); |
|
|
|
} |
|
|
|
@ -598,15 +863,73 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getRebateName())) { |
|
|
|
qw.like("rebateName", query.getRebateName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getState())) { |
|
|
|
qw.eq("state", query.getState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUseOrgName())) { |
|
|
|
qw.like("useOrgName", query.getUseOrgName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
qw.eq("adjustmentState", 0); |
|
|
|
qw.eq("state", 2); |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
if (StringUtils.isNotBlank(query.getPalceGenDate())) { |
|
|
|
qw.eq("palceGenDate", query.getPalceGenDate()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWithholdingDate())) { |
|
|
|
String[] w = query.getWithholdingDate().split("-"); |
|
|
|
String withholdingDate = w[0] + "年" + Integer.parseInt(w[1]) + "月"; |
|
|
|
qw.eq("withholdingDate", withholdingDate); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUploadState())) { |
|
|
|
if (query.getUploadState().equals("0")) { |
|
|
|
qw.and(wrapper -> wrapper.eq("uploadDate", "") |
|
|
|
.or().isNull("uploadDate") |
|
|
|
); |
|
|
|
} else { |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsAdjustment())) { |
|
|
|
qw.eq("isAdjustment", query.getIsAdjustment()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsUploadFinish())) { |
|
|
|
if (query.getIsUploadFinish().equals("1")) { |
|
|
|
qw.eq("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} else { |
|
|
|
qw.ne("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOnceCheckState())) { |
|
|
|
qw.eq("onceCheckState", query.getOnceCheckState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSecondUploadState())) { |
|
|
|
if (query.getSecondUploadState().equals("1")) { |
|
|
|
qw.isNotNull("secondaryUploadMoney"); |
|
|
|
qw.ne("secondaryUploadMoney", ""); |
|
|
|
qw.ne("secondaryUploadMoney", 0); |
|
|
|
qw.eq("isAdjustment", "是"); |
|
|
|
} else { |
|
|
|
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", "")); |
|
|
|
} |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.eq("adjustmentState", 0); |
|
|
|
qw.eq("state", 2); |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
String uploadStartDate = query.getUploadStartDate(); |
|
|
|
String uploadEndDate = query.getUploadEndDate(); |
|
|
|
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"). |
|
|
|
or(). |
|
|
|
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
List<TwoExcelVo> twoExcelVos = baseMapper.excelListTwo(qw); |
|
|
|
for (TwoExcelVo twoExcelVo : twoExcelVos) { |
|
|
|
@ -619,26 +942,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
ScmVehRebateQuery query = pq.getParams(); |
|
|
|
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>(); |
|
|
|
qw.eq("createOrgSid", query.getCreateOrgSid()); |
|
|
|
if (StringUtils.isNotBlank(query.getBrandName())) { |
|
|
|
qw.like("brandName", query.getBrandName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVehModelName())) { |
|
|
|
qw.like("vehModelName", query.getVehModelName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getVinNo())) { |
|
|
|
qw.like("vinNo", query.getVinNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getRebateTypeKey())) { |
|
|
|
qw.eq("rebateTypeKey", query.getRebateTypeKey()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getRebateName())) { |
|
|
|
qw.like("rebateName", query.getRebateName()); |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.eq("adjustmentState", 0); |
|
|
|
qw.eq("state", 2); |
|
|
|
if (query.getSidList().size() > 0) { |
|
|
|
@ -1194,15 +1497,17 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
} else { |
|
|
|
List<OneExcelInfo> infos = importReturn.getInfos(); |
|
|
|
for (OneExcelInfo info : infos) { |
|
|
|
ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); |
|
|
|
String uploadDate = ""; |
|
|
|
if (isNumber(info.getUploadDate())) { |
|
|
|
Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000)); |
|
|
|
uploadDate = DateUtil.formatDate(javaDate); |
|
|
|
} else { |
|
|
|
uploadDate = info.getUploadDate(); |
|
|
|
if (StringUtils.isNotBlank(info.getUploadDate()) && StringUtils.isNotBlank(info.getUploadMoney())) { |
|
|
|
ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); |
|
|
|
String uploadDate = ""; |
|
|
|
if (isNumber(info.getUploadDate())) { |
|
|
|
Date javaDate = new Date((long) ((Double.valueOf(info.getUploadDate()) - 25569) * 86400 * 1000)); |
|
|
|
uploadDate = DateUtil.formatDate(javaDate); |
|
|
|
} else { |
|
|
|
uploadDate = info.getUploadDate(); |
|
|
|
} |
|
|
|
baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); |
|
|
|
} |
|
|
|
baseMapper.updateOneExcelInfo(uploadDate, info.getUploadMoney(), info.getStayDetermineMoney(), info.getOnceTreatCost(), info.getOnceSuppCost(), info.getOnceSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); |
|
|
|
} |
|
|
|
return rb.success().setMsg("成功导入数据，请点击确定按钮"); |
|
|
|
} |
|
|
|
@ -1437,13 +1742,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
checkWord.add("返利类型不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getRebateTypeValue())) { |
|
|
|
String dictKey = dictCommonFeign.selectByValue(excelInfo.getRebateTypeValue()).getData(); |
|
|
|
if (StringUtils.isBlank(dictKey)) { |
|
|
|
checkWord.add("车架号" + excelInfo.getVinNo() + "导入的返利类型填写不正确"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getEstimateRebate())) { |
|
|
|
checkWord.add("预提返利不能为空"); |
|
|
|
break; |
|
|
|
@ -1485,10 +1783,22 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getUploadDate())) { |
|
|
|
checkWord.add("上传日期不能为空"); |
|
|
|
if (StringUtils.isBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) { |
|
|
|
if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
checkWord.add("上传日期不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isBlank(excelInfo.getUploadMoney())) { |
|
|
|
checkWord.add("上传金额不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){ |
|
|
|
if (new BigDecimal(excelInfo.getUploadMoney()).compareTo(BigDecimal.ZERO) == 0){ |
|
|
|
checkWord.add("上传金额不能为0"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getUploadDate())) { |
|
|
|
String uploadDate = ""; |
|
|
|
if (isNumber(excelInfo.getUploadDate())) { |
|
|
|
@ -1506,10 +1816,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getUploadMoney())) { |
|
|
|
checkWord.add("上传金额不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) { |
|
|
|
String uploadMoney = excelInfo.getUploadMoney(); |
|
|
|
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); |
|
|
|
@ -1519,10 +1825,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getStayDetermineMoney())) { |
|
|
|
checkWord.add("待确定金额不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) { |
|
|
|
String stayDetermineMoney = excelInfo.getStayDetermineMoney(); |
|
|
|
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); |
|
|
|
@ -1532,10 +1834,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getOnceTreatCost())) { |
|
|
|
checkWord.add("待支付费用不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) { |
|
|
|
String onceTreatCost = excelInfo.getOnceTreatCost(); |
|
|
|
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); |
|
|
|
@ -1545,10 +1843,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getOnceSuppCost())) { |
|
|
|
checkWord.add("抵顶费用不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) { |
|
|
|
String onceSuppCost = excelInfo.getOnceSuppCost(); |
|
|
|
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); |
|
|
|
@ -1558,29 +1852,31 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO); |
|
|
|
//上传返利金额
|
|
|
|
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())); |
|
|
|
//预提返利-其中预提费用
|
|
|
|
BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost())); |
|
|
|
//调整金额
|
|
|
|
BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getWithholdCost())); |
|
|
|
if (i > 0) { |
|
|
|
excelInfo.setIsAdjustment("否"); |
|
|
|
excelInfo.setAdjustmentMoney("0"); |
|
|
|
} else if (i == 0) { |
|
|
|
if (scflje.compareTo(ytfy) > 0) { |
|
|
|
excelInfo.setIsAdjustment("是"); |
|
|
|
excelInfo.setAdjustmentMoney(tzje.toString()); |
|
|
|
} else if (scflje.compareTo(ytfy) == 0) { |
|
|
|
excelInfo.setIsAdjustment("是"); |
|
|
|
excelInfo.setAdjustmentMoney(tzje.toString()); |
|
|
|
} else if (scflje.compareTo(ytfy) < 0) { |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) { |
|
|
|
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO); |
|
|
|
//上传返利金额
|
|
|
|
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())); |
|
|
|
//预提返利-其中预提费用
|
|
|
|
BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost())); |
|
|
|
//调整金额
|
|
|
|
BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getWithholdCost())); |
|
|
|
if (i > 0) { |
|
|
|
excelInfo.setIsAdjustment("否"); |
|
|
|
excelInfo.setAdjustmentMoney("0"); |
|
|
|
} else if (i == 0) { |
|
|
|
if (scflje.compareTo(ytfy) > 0) { |
|
|
|
excelInfo.setIsAdjustment("是"); |
|
|
|
excelInfo.setAdjustmentMoney(tzje.toString()); |
|
|
|
} else if (scflje.compareTo(ytfy) == 0) { |
|
|
|
excelInfo.setIsAdjustment("是"); |
|
|
|
excelInfo.setAdjustmentMoney(tzje.toString()); |
|
|
|
} else if (scflje.compareTo(ytfy) < 0) { |
|
|
|
excelInfo.setIsAdjustment("否"); |
|
|
|
excelInfo.setAdjustmentMoney("0"); |
|
|
|
} |
|
|
|
} |
|
|
|
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString()); |
|
|
|
} |
|
|
|
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
StringBuffer sbcheck1 = new StringBuffer(); |
|
|
|
@ -1634,15 +1930,17 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
} else { |
|
|
|
List<TwoExcelInfo> infos = importReturn.getInfos(); |
|
|
|
for (TwoExcelInfo info : infos) { |
|
|
|
ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); |
|
|
|
String secondaryUploadDate = ""; |
|
|
|
if (isNumber(info.getSecondaryUploadDate())) { |
|
|
|
Date javaDate = new Date((long) ((Double.valueOf(info.getSecondaryUploadDate()) - 25569) * 86400 * 1000)); |
|
|
|
secondaryUploadDate = DateUtil.formatDate(javaDate); |
|
|
|
} else { |
|
|
|
secondaryUploadDate = info.getSecondaryUploadDate(); |
|
|
|
if (StringUtils.isNotBlank(info.getSecondaryUploadDate()) && StringUtils.isNotBlank(info.getSecondaryUploadMoney())) { |
|
|
|
ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(info.getVinNo(), info.getRebateTypeValue(), info.getRebateName(), info.getPalceGenDate(), info.getEstimateRebate(), useOrgSid); |
|
|
|
String secondaryUploadDate = ""; |
|
|
|
if (isNumber(info.getSecondaryUploadDate())) { |
|
|
|
Date javaDate = new Date((long) ((Double.valueOf(info.getSecondaryUploadDate()) - 25569) * 86400 * 1000)); |
|
|
|
secondaryUploadDate = DateUtil.formatDate(javaDate); |
|
|
|
} else { |
|
|
|
secondaryUploadDate = info.getSecondaryUploadDate(); |
|
|
|
} |
|
|
|
baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); |
|
|
|
} |
|
|
|
baseMapper.updateTwoExcelInfo(secondaryUploadDate, info.getSecondaryUploadMoney(), info.getSecondTreatCost(), info.getSecondSuppCost(), info.getSecondSuppRemark(), info.getAdjustmentRemarks(), info.getIsAdjustment(), info.getAdjustmentMoney(), info.getDiffAmount(), scmVehRebateVo.getSid()); |
|
|
|
} |
|
|
|
return rb.success().setMsg("成功导入数据，请点击确定按钮"); |
|
|
|
} |
|
|
|
@ -1889,13 +2187,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
checkWord.add("返利类型不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getRebateTypeValue())) { |
|
|
|
String dictKey = dictCommonFeign.selectByValue(excelInfo.getRebateTypeValue()).getData(); |
|
|
|
if (StringUtils.isBlank(dictKey)) { |
|
|
|
checkWord.add("车架号" + excelInfo.getVinNo() + "导入的返利类型填写不正确"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getEstimateRebate())) { |
|
|
|
checkWord.add("预提返利不能为空"); |
|
|
|
break; |
|
|
|
@ -1997,10 +2288,22 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getUploadDate())) { |
|
|
|
checkWord.add("二次上传日期不能为空"); |
|
|
|
if (StringUtils.isBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) { |
|
|
|
if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) != 0){ |
|
|
|
checkWord.add("二次上传日期不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) { |
|
|
|
checkWord.add("二次上传金额不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){ |
|
|
|
if (new BigDecimal(excelInfo.getSecondaryUploadMoney()).compareTo(BigDecimal.ZERO) == 0){ |
|
|
|
checkWord.add("二次上传金额不能为0"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate())) { |
|
|
|
String secondaryUploadDate = ""; |
|
|
|
if (isNumber(excelInfo.getSecondaryUploadDate())) { |
|
|
|
@ -2018,10 +2321,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getSecondaryUploadMoney())) { |
|
|
|
checkWord.add("二次上传金额不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) { |
|
|
|
String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney(); |
|
|
|
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); |
|
|
|
@ -2031,10 +2330,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getSecondTreatCost())) { |
|
|
|
checkWord.add("待支付费用不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) { |
|
|
|
String secondTreatCost = excelInfo.getSecondTreatCost(); |
|
|
|
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); |
|
|
|
@ -2044,10 +2339,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getSecondSuppCost())) { |
|
|
|
checkWord.add("抵顶费费用不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) { |
|
|
|
String secondSuppCost = excelInfo.getSecondSuppCost(); |
|
|
|
Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$"); |
|
|
|
@ -2057,29 +2348,31 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO); |
|
|
|
//上传返利金额
|
|
|
|
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())); |
|
|
|
//预提返利-其中预提费用
|
|
|
|
BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost())); |
|
|
|
//调整金额
|
|
|
|
BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getWithholdCost())); |
|
|
|
if (i > 0) { |
|
|
|
excelInfo.setIsAdjustment("否"); |
|
|
|
excelInfo.setAdjustmentMoney("0"); |
|
|
|
} else if (i == 0) { |
|
|
|
if (scflje.compareTo(ytfy) > 0) { |
|
|
|
excelInfo.setIsAdjustment("是"); |
|
|
|
excelInfo.setAdjustmentMoney(tzje.toString()); |
|
|
|
} else if (scflje.compareTo(ytfy) == 0) { |
|
|
|
excelInfo.setIsAdjustment("是"); |
|
|
|
excelInfo.setAdjustmentMoney(tzje.toString()); |
|
|
|
} else if (scflje.compareTo(ytfy) < 0) { |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) { |
|
|
|
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO); |
|
|
|
//上传返利金额
|
|
|
|
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())); |
|
|
|
//预提返利-其中预提费用
|
|
|
|
BigDecimal ytfy = new BigDecimal(excelInfo.getEstimateRebate()).subtract(new BigDecimal(excelInfo.getWithholdCost())); |
|
|
|
//调整金额
|
|
|
|
BigDecimal tzje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost())).subtract(new BigDecimal(excelInfo.getEstimateRebate())).add(new BigDecimal(excelInfo.getWithholdCost())); |
|
|
|
if (i > 0) { |
|
|
|
excelInfo.setIsAdjustment("否"); |
|
|
|
excelInfo.setAdjustmentMoney("0"); |
|
|
|
} else if (i == 0) { |
|
|
|
if (scflje.compareTo(ytfy) > 0) { |
|
|
|
excelInfo.setIsAdjustment("是"); |
|
|
|
excelInfo.setAdjustmentMoney(tzje.toString()); |
|
|
|
} else if (scflje.compareTo(ytfy) == 0) { |
|
|
|
excelInfo.setIsAdjustment("是"); |
|
|
|
excelInfo.setAdjustmentMoney(tzje.toString()); |
|
|
|
} else if (scflje.compareTo(ytfy) < 0) { |
|
|
|
excelInfo.setIsAdjustment("否"); |
|
|
|
excelInfo.setAdjustmentMoney("0"); |
|
|
|
} |
|
|
|
} |
|
|
|
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString()); |
|
|
|
} |
|
|
|
excelInfo.setDiffAmount(scflje.subtract(ytfy).toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
StringBuffer sbcheck1 = new StringBuffer(); |
|
|
|
@ -2115,6 +2408,12 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean delByVehSid2(String vehSid, String useOrgSid, String key) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
baseMapper.delByVehSid2(vehSid, useOrgSid, key); |
|
|
|
return rb.success(); |
|
|
|
} |
|
|
|
|
|
|
|
public List<ScmVehRebateExcelVo> excelList(ScmVehRebateQuery query) { |
|
|
|
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>(); |
|
|
|
//========================================数据授权开始
|
|
|
|
@ -2181,11 +2480,60 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { |
|
|
|
qw.like("purchaseSystemName", query.getPurchaseSystemName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getPalceGenDate())) { |
|
|
|
qw.eq("palceGenDate", query.getPalceGenDate()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getWithholdingDate())) { |
|
|
|
String[] w = query.getWithholdingDate().split("-"); |
|
|
|
String withholdingDate = w[0] + "年" + Integer.parseInt(w[1]) + "月"; |
|
|
|
qw.eq("withholdingDate", withholdingDate); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getUploadState())) { |
|
|
|
if (query.getUploadState().equals("0")) { |
|
|
|
qw.and(wrapper -> wrapper.eq("uploadDate", "") |
|
|
|
.or().isNull("uploadDate") |
|
|
|
); |
|
|
|
} else { |
|
|
|
qw.ne("uploadDate", ""); |
|
|
|
qw.isNotNull("uploadDate"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsAdjustment())) { |
|
|
|
qw.eq("isAdjustment", query.getIsAdjustment()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getIsUploadFinish())) { |
|
|
|
if (query.getIsUploadFinish().equals("1")) { |
|
|
|
qw.eq("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} else { |
|
|
|
qw.ne("estimateRebate - IFNULL(uploadMoney,0) - IFNULL(secondaryUploadMoney,0) + IFNULL(adjustmentMoney,0)", 0); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getOnceCheckState())) { |
|
|
|
qw.eq("onceCheckState", query.getOnceCheckState()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getSecondUploadState())) { |
|
|
|
if (query.getSecondUploadState().equals("1")) { |
|
|
|
qw.isNotNull("secondaryUploadMoney"); |
|
|
|
qw.ne("secondaryUploadMoney", ""); |
|
|
|
qw.ne("secondaryUploadMoney", 0); |
|
|
|
qw.eq("isAdjustment", "是"); |
|
|
|
} else { |
|
|
|
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", "")); |
|
|
|
} |
|
|
|
} |
|
|
|
String createStartTime = query.getCreateStartTime(); |
|
|
|
String createEndTime = query.getCreateEndTime(); |
|
|
|
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
String uploadStartDate = query.getUploadStartDate(); |
|
|
|
String uploadEndDate = query.getUploadEndDate(); |
|
|
|
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"). |
|
|
|
or(). |
|
|
|
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("createTime"); |
|
|
|
List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw); |
|
|
|
for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) { |
|
|
|
@ -2208,13 +2556,6 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper, |
|
|
|
scmVehRebateExcelVo.setOnceCheckState("一次核对中"); |
|
|
|
} |
|
|
|
scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime()))); |
|
|
|
if ("是".equals(scmVehRebateExcelVo.getIsAdjustment())) { |
|
|
|
scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost())); |
|
|
|
scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost())); |
|
|
|
} else { |
|
|
|
scmVehRebateExcelVo.setTreatAdjustmentMoney(BigDecimal.ZERO); |
|
|
|
scmVehRebateExcelVo.setSuppAdjustmentMoney(BigDecimal.ZERO); |
|
|
|
} |
|
|
|
} |
|
|
|
return scmVehRebateExcelVos; |
|
|
|
} |
|
|
|
|
