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

1

master
God 7 months ago
parent
4d248bf9e9
commit
f28d15049b
5 changed files with 343 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java
  2. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java
  3. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelInfo.java
  4. 38
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java
  5. 346
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java
View File

@ -44,16 +44,16 @@ public class OneExcelVo {
@ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost")
@ExportEntityMap(CnName = "其中支出费用", EnName = "onceItureCost")
private String onceItureCost;
@ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
@ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
private String onceTreatCost;
@ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
private String onceSuppCost;
@ExportEntityMap(CnName = "一次抵顶费用说明", EnName = "onceSuppRemark")
@ExportEntityMap(CnName = "抵顶费用说明", EnName = "onceSuppRemark")
private String onceSuppRemark;
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java
View File

@ -88,6 +88,7 @@ public class ScmSpecialRebateVo implements Vo {
private String adjustmentMoney;
@ApiModelProperty("调整说明")
private String adjustmentRemarks;
@ApiModelProperty("待确定金额(动态)")
private String stayDetermineMoney;
@ApiModelProperty("其中预计费用")
@ -107,6 +108,8 @@ public class ScmSpecialRebateVo implements Vo {
@ApiModelProperty("预计抵顶费用说明")
private String expectSuppRemark;
@ApiModelProperty("一次核对状态")
private Integer onceCheckState;
@ApiModelProperty("一次支出费用")
private BigDecimal onceItureCost;
@ApiModelProperty("一次待支付费用")

20
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelInfo.java
View File

@ -10,6 +10,10 @@ import lombok.Data;
@Data
public class TwoExcelInfo {
//采购系统
private String purchaseSystemName;
//品牌名称
private String brandName;
//创建日期
private String createTime;
//返利名称
@ -18,18 +22,30 @@ public class TwoExcelInfo {
private String rebateTypeValue;
//预提返利
private String estimateRebate;
//其中预提费用
private String expectCost;
//所属年月
private String palceGenDate;
//上传日期
private String uploadDate;
//上传金额
private String uploadMoney;
//其中费用
private String money;
//待确定金额
private String stayDetermineMoney;
//二次上传日期
private String secondaryUploadDate;
//二次上传金额
private String secondaryUploadMoney;
//费用
private String money;
//其中支出费用
private String secondItureCost;
//其中待支付费用
private String secondTreatCost;
//其中抵顶费用
private String secondSuppCost;
//抵顶费用说明
private String secondSuppRemark;
//调整说明
private String adjustmentRemarks;
}

38
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java
View File

@ -11,46 +11,60 @@ import lombok.Data;
@Data
public class TwoExcelVo {
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
private String brandName;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime;
//返利名称
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName;
//返利类型
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue;
//预提返利
@ExportEntityMap(CnName = "预提返利", EnName = "estimateRebate")
private String estimateRebate;
//上传日期
@ExportEntityMap(CnName = "其中预提费用", EnName = "expectCost")
private String expectCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate;
//上传金额
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney;
//待确定金额
@ExportEntityMap(CnName = "其中费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
//二次上传日期
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
//二次上传金额
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney;
//费用
@ExportEntityMap(CnName = "费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "其中支出费用", EnName = "secondItureCost")
private String secondItureCost;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
private String secondTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
private String secondSuppCost;
@ExportEntityMap(CnName = "抵顶费用说明", EnName = "secondSuppRemark")
private String secondSuppRemark;
//调整说明
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
private String adjustmentRemarks;
}

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

@ -553,37 +553,52 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
for (int j = 0; j < resultCell.length; j++) {
if (i == resultCell[j]) {
switch (i) {
/*case 0:
//importVo.set(temp);
break;
case 0:
importVo.setCreateTime(temp);
importVo.setPurchaseSystemName(temp);
break;
case 0:
importVo.setCreateTime(temp);
break;*/
case 1:
importVo.setRebateName(temp);
importVo.setBrandName(temp);
break;
case 2:
importVo.setRebateTypeValue(temp);
importVo.setCreateTime(temp);
break;
case 3:
importVo.setEstimateRebate(temp);
importVo.setRebateName(temp);
break;
case 4:
importVo.setUploadDate(temp);
importVo.setRebateTypeValue(temp);
break;
case 5:
importVo.setUploadMoney(temp);
importVo.setEstimateRebate(temp);
break;
case 6:
importVo.setStayDetermineMoney(temp);
importVo.setExpectCost(temp);
break;
case 7:
//importVo.setMoney(temp);
importVo.setPalceGenDate(temp);
break;
case 8:
importVo.setUploadDate(temp);
break;
case 9:
importVo.setUploadMoney(temp);
break;
case 10:
importVo.setStayDetermineMoney(temp);
break;
case 11:
importVo.setOnceItureCost(temp);
break;
case 12:
importVo.setOnceTreatCost(temp);
break;
case 13:
importVo.setOnceSuppCost(temp);
break;
case 14:
importVo.setOnceSuppRemark(temp);
break;
case 15:
importVo.setAdjustmentRemarks(temp);
break;
default:
@ -598,30 +613,51 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
String word = new String();
switch (i) {
case 0:
word = "创建日期";
word = "采购系统";
break;
case 1:
word = "返利名称";
word = "品牌";
break;
case 2:
word = "返利类型";
word = "创建日期";
break;
case 3:
word = "预提返利";
word = "返利名称";
break;
case 4:
word = "上传日期";
word = "返利类型";
break;
case 5:
word = "上传金额";
word = "预提返利";
break;
case 6:
word = "待确定金额";
word = "其中预提费用";
break;
case 7:
word = "费用";
word = "所属年月";
break;
case 8:
word = "上传日期";
break;
case 9:
word = "上传金额";
break;
case 10:
word = "待确定金额";
break;
case 11:
word = "其中支出费用";
break;
case 12:
word = "其中待支付费用";
break;
case 13:
word = "其中抵顶费用";
break;
case 14:
word = "抵顶费用说明";
break;
case 15:
word = "调整说明";
break;
default:
@ -640,10 +676,18 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");
break;
}
/*if (scmSpecialRebateVo.get() == 1) {
if (scmSpecialRebateVo.getOnceCheckState() == 1) {
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已调整");
break;
}*/
}
if (StringUtils.isBlank(excelInfo.getPurchaseSystemName())) {
checkWord.add("采购系统不能为空");
break;
}
if (StringUtils.isBlank(excelInfo.getBrandName())) {
checkWord.add("品牌名称不能为空");
break;
}
if (StringUtils.isBlank(excelInfo.getCreateTime())) {
checkWord.add("创建日期不能为空");
break;
@ -693,6 +737,34 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
break;
}
}
if (StringUtils.isBlank(excelInfo.getExpectCost())) {
checkWord.add("其中预提费用不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getExpectCost())) {
String expectCost = excelInfo.getExpectCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(expectCost).matches();
if (!matches) {
checkWord.add("其中预提费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getPalceGenDate())) {
checkWord.add("所属年月不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getPalceGenDate())) {
String palceGenDate = excelInfo.getPalceGenDate();
String[] split = palceGenDate.split("-");
if (split.length != 2) {
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的所属年月填写不正确，格式yyyy-MM");
break;
} else if (!isFourDigitNumber(split[0]) || !isTwoDigitNumber(split[1])) {
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的所属年月填写不正确，格式yyyy-MM");
break;
}
}
if (StringUtils.isBlank(excelInfo.getUploadDate())) {
checkWord.add("上传日期不能为空");
break;
@ -740,6 +812,49 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
break;
}
}
if (StringUtils.isBlank(excelInfo.getOnceItureCost())) {
checkWord.add("其中支出费用不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getOnceItureCost())) {
String onceItureCost = excelInfo.getOnceItureCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(onceItureCost).matches();
if (!matches) {
checkWord.add("其中支出费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getOnceTreatCost())) {
checkWord.add("其中待支付费用不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
String onceTreatCost = excelInfo.getOnceTreatCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(onceTreatCost).matches();
if (!matches) {
checkWord.add("其中待支付费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getOnceSuppCost())) {
checkWord.add("其中抵顶费用不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
String onceSuppCost = excelInfo.getOnceSuppCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(onceSuppCost).matches();
if (!matches) {
checkWord.add("其中抵顶费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getOnceSuppRemark())) {
checkWord.add("抵顶费用说明不能为空");
break;
}
if (StringUtils.isBlank(excelInfo.getAdjustmentRemarks())) {
checkWord.add("调整说明不能为空");
break;
@ -838,7 +953,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
return rb.fail().setMsg("上传文件不正确");
}
int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
int[] resultCell = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18};
boolean isExcel2003 = true;
if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
isExcel2003 = false;
@ -892,36 +1007,60 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
if (i == resultCell[j]) {
switch (i) {
case 0:
importVo.setCreateTime(temp);
importVo.setPurchaseSystemName(temp);
break;
case 1:
importVo.setRebateName(temp);
importVo.setBrandName(temp);
break;
case 2:
importVo.setRebateTypeValue(temp);
importVo.setCreateTime(temp);
break;
case 3:
importVo.setEstimateRebate(temp);
importVo.setRebateName(temp);
break;
case 4:
importVo.setUploadDate(temp);
importVo.setRebateTypeValue(temp);
break;
case 5:
importVo.setUploadMoney(temp);
importVo.setEstimateRebate(temp);
break;
case 6:
importVo.setStayDetermineMoney(temp);
importVo.setExpectCost(temp);
break;
case 7:
importVo.setSecondaryUploadDate(temp);
importVo.setPalceGenDate(temp);
break;
case 8:
importVo.setSecondaryUploadMoney(temp);
importVo.setUploadDate(temp);
break;
case 9:
importVo.setMoney(temp);
importVo.setUploadMoney(temp);
break;
case 10:
importVo.setMoney(temp);
break;
case 11:
importVo.setStayDetermineMoney(temp);
break;
case 12:
importVo.setSecondaryUploadDate(temp);
break;
case 13:
importVo.setSecondaryUploadMoney(temp);
break;
case 14:
importVo.setSecondItureCost(temp);
break;
case 15:
importVo.setSecondTreatCost(temp);
break;
case 16:
importVo.setSecondSuppCost(temp);
break;
case 17:
importVo.setSecondSuppRemark(temp);
break;
case 18:
importVo.setAdjustmentRemarks(temp);
break;
default:
@ -936,36 +1075,60 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
String word = new String();
switch (i) {
case 0:
word = "创建日期";
word = "采购系统";
break;
case 1:
word = "返利名称";
word = "品牌";
break;
case 2:
word = "返利类型";
word = "创建日期";
break;
case 3:
word = "预提返利";
word = "返利名称";
break;
case 4:
word = "上传日期";
word = "返利类型";
break;
case 5:
word = "上传金额";
word = "预提返利";
break;
case 6:
word = "待确定金额";
word = "其中预提费用";
break;
case 7:
word = "二次上传日期";
word = "所属年月";
break;
case 8:
word = "二次上传金额";
word = "上传日期";
break;
case 9:
word = "费用";
word = "上传金额";
break;
case 10:
word = "其中费用";
break;
case 11:
word = "待确定金额";
break;
case 12:
word = "二次上传日期";
break;
case 13:
word = "二次上传金额";
break;
case 14:
word = "其中支出费用";
break;
case 15:
word = "其中待支付费用";
break;
case 16:
word = "其中抵顶费用";
break;
case 17:
word = "抵顶费用说明";
break;
case 18:
word = "调整说明";
break;
default:
@ -984,10 +1147,18 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息不存在");
break;
}
/* if (excelInfo.getOnceCheckState() == 1) {
checkWord.add("车架号" + excelInfo.getRebateName() + "导入的返利信息已核对");
if (scmSpecialRebateVo.getOnceCheckState() == 1) {
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已核对");
break;
}*/
}
if (StringUtils.isBlank(excelInfo.getPurchaseSystemName())) {
checkWord.add("采购系统不能为空");
break;
}
if (StringUtils.isBlank(excelInfo.getBrandName())) {
checkWord.add("品牌名称不能为空");
break;
}
if (StringUtils.isBlank(excelInfo.getCreateTime())) {
checkWord.add("创建日期不能为空");
break;
@ -1037,6 +1208,34 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
break;
}
}
if (StringUtils.isBlank(excelInfo.getExpectCost())) {
checkWord.add("其中预提费用不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getExpectCost())) {
String expectCost = excelInfo.getExpectCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(expectCost).matches();
if (!matches) {
checkWord.add("其中预提费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getPalceGenDate())) {
checkWord.add("所属年月不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getPalceGenDate())) {
String palceGenDate = excelInfo.getPalceGenDate();
String[] split = palceGenDate.split("-");
if (split.length != 2) {
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的所属年月填写不正确，格式yyyy-MM");
break;
} else if (!isFourDigitNumber(split[0]) || !isTwoDigitNumber(split[1])) {
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的所属年月填写不正确，格式yyyy-MM");
break;
}
}
if (StringUtils.isBlank(excelInfo.getUploadDate())) {
checkWord.add("上传日期不能为空");
break;
@ -1071,6 +1270,19 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
break;
}
}
if (StringUtils.isBlank(excelInfo.getMoney())) {
checkWord.add("其中费用不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getMoney())) {
String money = excelInfo.getMoney();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(money).matches();
if (!matches) {
checkWord.add("其中费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getStayDetermineMoney())) {
checkWord.add("待确定金额不能为空");
break;
@ -1118,19 +1330,45 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
break;
}
}
if (StringUtils.isBlank(excelInfo.getMoney())) {
checkWord.add("费用不能为空");
if (StringUtils.isNotBlank(excelInfo.getSecondItureCost())) {
String secondItureCost = excelInfo.getSecondItureCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(secondItureCost).matches();
if (!matches) {
checkWord.add("其中支出费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getSecondTreatCost())) {
checkWord.add("其中待支付费用不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getMoney())) {
String money = excelInfo.getMoney();
if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
String secondTreatCost = excelInfo.getSecondTreatCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(money).matches();
boolean matches = pattern.matcher(secondTreatCost).matches();
if (!matches) {
checkWord.add("费用必须为数字");
checkWord.add("其中待支付费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getSecondSuppCost())) {
checkWord.add("其中抵顶费用不能为空");
break;
}
if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
String secondSuppCost = excelInfo.getSecondSuppCost();
Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
boolean matches = pattern.matcher(secondSuppCost).matches();
if (!matches) {
checkWord.add("其中抵顶费用必须为数字");
break;
}
}
if (StringUtils.isBlank(excelInfo.getSecondSuppRemark())) {
checkWord.add("抵顶费用说明不能为空");
break;
}
if (StringUtils.isBlank(excelInfo.getAdjustmentRemarks())) {
checkWord.add("调整说明不能为空");
break;

Write Preview
Loading…
Cancel
Save