yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改

master
ligaode 4 months ago
parent
57492fb7ec
commit
6b46d54e73
4 changed files with 53 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  2. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
  3. 13
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  4. 44
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

32
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
View File

@ -719,7 +719,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) { if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
String estimateRebate = excelInfo.getEstimateRebate(); String estimateRebate = excelInfo.getEstimateRebate();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(estimateRebate).matches(); boolean matches = pattern.matcher(estimateRebate).matches();
if (!matches) { if (!matches) {
checkWord.add("预提返利必须为数字"); checkWord.add("预提返利必须为数字");
@ -732,7 +732,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getExpectCost())) { if (StringUtils.isNotBlank(excelInfo.getExpectCost())) {
String expectCost = excelInfo.getExpectCost(); String expectCost = excelInfo.getExpectCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(expectCost).matches(); boolean matches = pattern.matcher(expectCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中预提费用必须为数字"); checkWord.add("其中预提费用必须为数字");
@ -781,7 +781,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) { if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
String uploadMoney = excelInfo.getUploadMoney(); String uploadMoney = excelInfo.getUploadMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(uploadMoney).matches(); boolean matches = pattern.matcher(uploadMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("上传金额必须为数字"); checkWord.add("上传金额必须为数字");
@ -794,7 +794,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) { if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
String stayDetermineMoney = excelInfo.getStayDetermineMoney(); String stayDetermineMoney = excelInfo.getStayDetermineMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(stayDetermineMoney).matches(); boolean matches = pattern.matcher(stayDetermineMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("待确定金额必须为数字"); checkWord.add("待确定金额必须为数字");
@ -807,7 +807,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getOnceItureCost())) { if (StringUtils.isNotBlank(excelInfo.getOnceItureCost())) {
String onceItureCost = excelInfo.getOnceItureCost(); String onceItureCost = excelInfo.getOnceItureCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(onceItureCost).matches(); boolean matches = pattern.matcher(onceItureCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中支出费用必须为数字"); checkWord.add("其中支出费用必须为数字");
@ -820,7 +820,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) { if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
String onceTreatCost = excelInfo.getOnceTreatCost(); String onceTreatCost = excelInfo.getOnceTreatCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(onceTreatCost).matches(); boolean matches = pattern.matcher(onceTreatCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中待支付费用必须为数字"); checkWord.add("其中待支付费用必须为数字");
@ -833,7 +833,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) { if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
String onceSuppCost = excelInfo.getOnceSuppCost(); String onceSuppCost = excelInfo.getOnceSuppCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(onceSuppCost).matches(); boolean matches = pattern.matcher(onceSuppCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中抵顶费用必须为数字"); checkWord.add("其中抵顶费用必须为数字");
@ -1211,7 +1211,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) { if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
String estimateRebate = excelInfo.getEstimateRebate(); String estimateRebate = excelInfo.getEstimateRebate();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(estimateRebate).matches(); boolean matches = pattern.matcher(estimateRebate).matches();
if (!matches) { if (!matches) {
checkWord.add("预提返利必须为数字"); checkWord.add("预提返利必须为数字");
@ -1224,7 +1224,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getExpectCost())) { if (StringUtils.isNotBlank(excelInfo.getExpectCost())) {
String expectCost = excelInfo.getExpectCost(); String expectCost = excelInfo.getExpectCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(expectCost).matches(); boolean matches = pattern.matcher(expectCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中预提费用必须为数字"); checkWord.add("其中预提费用必须为数字");
@ -1273,7 +1273,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) { if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
String uploadMoney = excelInfo.getUploadMoney(); String uploadMoney = excelInfo.getUploadMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(uploadMoney).matches(); boolean matches = pattern.matcher(uploadMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("上传金额必须为数字"); checkWord.add("上传金额必须为数字");
@ -1286,7 +1286,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getMoney())) { if (StringUtils.isNotBlank(excelInfo.getMoney())) {
String money = excelInfo.getMoney(); String money = excelInfo.getMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(money).matches(); boolean matches = pattern.matcher(money).matches();
if (!matches) { if (!matches) {
checkWord.add("其中费用必须为数字"); checkWord.add("其中费用必须为数字");
@ -1299,7 +1299,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) { if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
String stayDetermineMoney = excelInfo.getStayDetermineMoney(); String stayDetermineMoney = excelInfo.getStayDetermineMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(stayDetermineMoney).matches(); boolean matches = pattern.matcher(stayDetermineMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("待确定金额必须为数字"); checkWord.add("待确定金额必须为数字");
@ -1333,7 +1333,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) { if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney(); String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(secondaryUploadMoney).matches(); boolean matches = pattern.matcher(secondaryUploadMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("二次上传金额必须为数字"); checkWord.add("二次上传金额必须为数字");
@ -1342,7 +1342,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getSecondItureCost())) { if (StringUtils.isNotBlank(excelInfo.getSecondItureCost())) {
String secondItureCost = excelInfo.getSecondItureCost(); String secondItureCost = excelInfo.getSecondItureCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(secondItureCost).matches(); boolean matches = pattern.matcher(secondItureCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中支出费用必须为数字"); checkWord.add("其中支出费用必须为数字");
@ -1355,7 +1355,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) { if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
String secondTreatCost = excelInfo.getSecondTreatCost(); String secondTreatCost = excelInfo.getSecondTreatCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(secondTreatCost).matches(); boolean matches = pattern.matcher(secondTreatCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中待支付费用必须为数字"); checkWord.add("其中待支付费用必须为数字");
@ -1368,7 +1368,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
} }
if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) { if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
String secondSuppCost = excelInfo.getSecondSuppCost(); String secondSuppCost = excelInfo.getSecondSuppCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(secondSuppCost).matches(); boolean matches = pattern.matcher(secondSuppCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中抵顶费用必须为数字"); checkWord.add("其中抵顶费用必须为数字");

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
View File

@ -69,7 +69,9 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate, @Param("secondaryUploadMoney") String secondaryUploadMoney, @Param("secondTreatCost") String secondTreatCost, @Param("secondSuppCost") String secondSuppCost, @Param("secondSuppRemark") String secondSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("isAdjustment") String isAdjustment, @Param("adjustmentMoney") String adjustmentMoney, @Param("diffAmount") String diffAmount, @Param("sid") String sid); void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate, @Param("secondaryUploadMoney") String secondaryUploadMoney, @Param("secondTreatCost") String secondTreatCost, @Param("secondSuppCost") String secondSuppCost, @Param("secondSuppRemark") String secondSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("isAdjustment") String isAdjustment, @Param("adjustmentMoney") String adjustmentMoney, @Param("diffAmount") String diffAmount, @Param("sid") String sid);
ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("calculationModeValue") String calculationModeValue, @Param("useOrgSid") String useOrgSid); ScmVehRebateVo selectByVinNoAndOrgSidDr(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("calculationModeValue") String calculationModeValue, @Param("useOrgSid") String useOrgSid);
ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("estimateRebate") String estimateRebate, @Param("useOrgSid") String useOrgSid);
@Update("update scm_veh_rebate set adjustmentState = #{adjustmentState} where sid = #{vehRebateSid}") @Update("update scm_veh_rebate set adjustmentState = #{adjustmentState} where sid = #{vehRebateSid}")
void updateAdjustmentState(@Param("vehRebateSid") String vehRebateSid, @Param("adjustmentState") int adjustmentState); void updateAdjustmentState(@Param("vehRebateSid") String vehRebateSid, @Param("adjustmentState") int adjustmentState);

13
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
View File

@ -39,7 +39,7 @@
)) ))
</select> </select>
<select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo"> <select id="selectByVinNoAndOrgSidDr" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
SELECT * SELECT *
FROM scm_veh_rebate FROM scm_veh_rebate
WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%') WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
@ -50,6 +50,17 @@
AND createOrgSid = #{useOrgSid} AND createOrgSid = #{useOrgSid}
</select> </select>
<select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
SELECT *
FROM scm_veh_rebate
WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
AND rebateTypeValue = #{rebateTypeValue}
AND rebateName = #{rebateName}
AND palceGenDate = #{palceGenDate}
AND estimateRebate = #{estimateRebate}
AND createOrgSid = #{useOrgSid}
</select>
<select id="excelListOne" resultType="com.yxt.anrui.scm.api.scmvehrebate.OneExcelVo"> <select id="excelListOne" resultType="com.yxt.anrui.scm.api.scmvehrebate.OneExcelVo">
SELECT SELECT
*, *,

44
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
View File

@ -820,7 +820,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (!importVoList.isEmpty()) { if (!importVoList.isEmpty()) {
for (ScmVehRebateExcelInfo excelInfo : importVoList) { for (ScmVehRebateExcelInfo excelInfo : importVoList) {
ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(excelInfo.getVinNo(), excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getPalceGenDate(), excelInfo.getCalculationModeValue(), useOrgSid); ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSidDr(excelInfo.getVinNo(), excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getPalceGenDate(), excelInfo.getCalculationModeValue(), useOrgSid);
if (scmVehRebateVo != null) { if (scmVehRebateVo != null) {
checkWord.add("车架号为" + excelInfo.getVinNo() + "的单车返利信息已存在"); checkWord.add("车架号为" + excelInfo.getVinNo() + "的单车返利信息已存在");
break; break;
@ -877,7 +877,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
// } // }
// if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) { // if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
// String estimateRebate = excelInfo.getEstimateRebate(); // String estimateRebate = excelInfo.getEstimateRebate();
// Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); // Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
// boolean matches = pattern.matcher(estimateRebate).matches(); // boolean matches = pattern.matcher(estimateRebate).matches();
// if (!matches) { // if (!matches) {
// checkWord.add("返利金额必须为数字"); // checkWord.add("返利金额必须为数字");
@ -890,7 +890,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getExpectTreatCost())) { if (StringUtils.isNotBlank(excelInfo.getExpectTreatCost())) {
String expectTreatCost = excelInfo.getExpectTreatCost(); String expectTreatCost = excelInfo.getExpectTreatCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(expectTreatCost).matches(); boolean matches = pattern.matcher(expectTreatCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中待支付费用必须为数字"); checkWord.add("其中待支付费用必须为数字");
@ -903,7 +903,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getExpectSuppCost())) { if (StringUtils.isNotBlank(excelInfo.getExpectSuppCost())) {
String expectSuppCost = excelInfo.getExpectSuppCost(); String expectSuppCost = excelInfo.getExpectSuppCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(expectSuppCost).matches(); boolean matches = pattern.matcher(expectSuppCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中抵顶费用必须为数字"); checkWord.add("其中抵顶费用必须为数字");
@ -1233,7 +1233,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getManufactorSettlementPrice())) { if (StringUtils.isNotBlank(excelInfo.getManufactorSettlementPrice())) {
String manufactorSettlementPrice = excelInfo.getManufactorSettlementPrice(); String manufactorSettlementPrice = excelInfo.getManufactorSettlementPrice();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(manufactorSettlementPrice).matches(); boolean matches = pattern.matcher(manufactorSettlementPrice).matches();
if (!matches) { if (!matches) {
checkWord.add("厂家结算价必须为数字"); checkWord.add("厂家结算价必须为数字");
@ -1246,7 +1246,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getFreight())) { if (StringUtils.isNotBlank(excelInfo.getFreight())) {
String freight = excelInfo.getFreight(); String freight = excelInfo.getFreight();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(freight).matches(); boolean matches = pattern.matcher(freight).matches();
if (!matches) { if (!matches) {
checkWord.add("其中运费金额必须为数字"); checkWord.add("其中运费金额必须为数字");
@ -1295,7 +1295,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) { if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
String estimateRebate = excelInfo.getEstimateRebate(); String estimateRebate = excelInfo.getEstimateRebate();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(estimateRebate).matches(); boolean matches = pattern.matcher(estimateRebate).matches();
if (!matches) { if (!matches) {
checkWord.add("预提返利必须为数字"); checkWord.add("预提返利必须为数字");
@ -1308,7 +1308,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) { if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) {
String withholdCost = excelInfo.getWithholdCost(); String withholdCost = excelInfo.getWithholdCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(withholdCost).matches(); boolean matches = pattern.matcher(withholdCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中预提费用必须为数字"); checkWord.add("其中预提费用必须为数字");
@ -1357,7 +1357,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) { if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
String uploadMoney = excelInfo.getUploadMoney(); String uploadMoney = excelInfo.getUploadMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(uploadMoney).matches(); boolean matches = pattern.matcher(uploadMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("上传金额必须为数字"); checkWord.add("上传金额必须为数字");
@ -1370,7 +1370,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) { if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
String stayDetermineMoney = excelInfo.getStayDetermineMoney(); String stayDetermineMoney = excelInfo.getStayDetermineMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(stayDetermineMoney).matches(); boolean matches = pattern.matcher(stayDetermineMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("待确定金额必须为数字"); checkWord.add("待确定金额必须为数字");
@ -1383,7 +1383,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) { if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
String onceTreatCost = excelInfo.getOnceTreatCost(); String onceTreatCost = excelInfo.getOnceTreatCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(onceTreatCost).matches(); boolean matches = pattern.matcher(onceTreatCost).matches();
if (!matches) { if (!matches) {
checkWord.add("待支付费用必须为数字"); checkWord.add("待支付费用必须为数字");
@ -1396,7 +1396,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) { if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
String onceSuppCost = excelInfo.getOnceSuppCost(); String onceSuppCost = excelInfo.getOnceSuppCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(onceSuppCost).matches(); boolean matches = pattern.matcher(onceSuppCost).matches();
if (!matches) { if (!matches) {
checkWord.add("抵顶费用必须为数字"); checkWord.add("抵顶费用必须为数字");
@ -1691,7 +1691,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getManufactorSettlementPrice())) { if (StringUtils.isNotBlank(excelInfo.getManufactorSettlementPrice())) {
String manufactorSettlementPrice = excelInfo.getManufactorSettlementPrice(); String manufactorSettlementPrice = excelInfo.getManufactorSettlementPrice();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(manufactorSettlementPrice).matches(); boolean matches = pattern.matcher(manufactorSettlementPrice).matches();
if (!matches) { if (!matches) {
checkWord.add("厂家结算价必须为数字"); checkWord.add("厂家结算价必须为数字");
@ -1704,7 +1704,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getFreight())) { if (StringUtils.isNotBlank(excelInfo.getFreight())) {
String freight = excelInfo.getFreight(); String freight = excelInfo.getFreight();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(freight).matches(); boolean matches = pattern.matcher(freight).matches();
if (!matches) { if (!matches) {
checkWord.add("其中运费金额必须为数字"); checkWord.add("其中运费金额必须为数字");
@ -1747,7 +1747,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) { if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
String estimateRebate = excelInfo.getEstimateRebate(); String estimateRebate = excelInfo.getEstimateRebate();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(estimateRebate).matches(); boolean matches = pattern.matcher(estimateRebate).matches();
if (!matches) { if (!matches) {
checkWord.add("预提返利必须为数字"); checkWord.add("预提返利必须为数字");
@ -1760,7 +1760,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) { if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) {
String withholdCost = excelInfo.getWithholdCost(); String withholdCost = excelInfo.getWithholdCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(withholdCost).matches(); boolean matches = pattern.matcher(withholdCost).matches();
if (!matches) { if (!matches) {
checkWord.add("其中预提费用必须为数字"); checkWord.add("其中预提费用必须为数字");
@ -1809,7 +1809,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) { if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
String uploadMoney = excelInfo.getUploadMoney(); String uploadMoney = excelInfo.getUploadMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(uploadMoney).matches(); boolean matches = pattern.matcher(uploadMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("上传金额必须为数字"); checkWord.add("上传金额必须为数字");
@ -1822,7 +1822,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) { if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
String stayDetermineMoney = excelInfo.getStayDetermineMoney(); String stayDetermineMoney = excelInfo.getStayDetermineMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(stayDetermineMoney).matches(); boolean matches = pattern.matcher(stayDetermineMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("待确定金额必须为数字"); checkWord.add("待确定金额必须为数字");
@ -1835,7 +1835,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getQzMoney())) { if (StringUtils.isNotBlank(excelInfo.getQzMoney())) {
String qzMoney = excelInfo.getQzMoney(); String qzMoney = excelInfo.getQzMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(qzMoney).matches(); boolean matches = pattern.matcher(qzMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("其中费用必须为数字"); checkWord.add("其中费用必须为数字");
@ -1869,7 +1869,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) { if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney(); String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(secondaryUploadMoney).matches(); boolean matches = pattern.matcher(secondaryUploadMoney).matches();
if (!matches) { if (!matches) {
checkWord.add("二次上传金额必须为数字"); checkWord.add("二次上传金额必须为数字");
@ -1882,7 +1882,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) { if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
String secondTreatCost = excelInfo.getSecondTreatCost(); String secondTreatCost = excelInfo.getSecondTreatCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(secondTreatCost).matches(); boolean matches = pattern.matcher(secondTreatCost).matches();
if (!matches) { if (!matches) {
checkWord.add("待支付费用必须为数字"); checkWord.add("待支付费用必须为数字");
@ -1895,7 +1895,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
} }
if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) { if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
String secondSuppCost = excelInfo.getSecondSuppCost(); String secondSuppCost = excelInfo.getSecondSuppCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$"); Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
boolean matches = pattern.matcher(secondSuppCost).matches(); boolean matches = pattern.matcher(secondSuppCost).matches();
if (!matches) { if (!matches) {
checkWord.add("抵顶费费用必须为数字"); checkWord.add("抵顶费费用必须为数字");

Write Preview
Loading…
Cancel
Save