|
|
|
@ -95,6 +95,7 @@ import java.io.InputStream; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.regex.Pattern; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
@ -191,8 +192,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi |
|
|
|
if (StringUtils.isNotBlank(query.getCreateByName())) { |
|
|
|
qw.like("createByName", query.getCreateByName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("billNo", query.getBillNo()); |
|
|
|
if (StringUtils.isNotBlank(query.getDeptName())) { |
|
|
|
qw.like("deptName", query.getDeptName()); |
|
|
|
} |
|
|
|
qw.apply(StringUtils.isNotBlank(query.getCreateStartTime()), "date_format (createTime,'%Y-%m-%d') >= date_format('" + query.getCreateStartTime() + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotBlank(query.getCreateEndTime()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getCreateEndTime() + "','%Y-%m-%d')" |
|
|
|
@ -553,14 +554,41 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi |
|
|
|
checkWord.add("期数不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getPeriod())){ |
|
|
|
String period = excelInfo.getPeriod(); |
|
|
|
Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$"); |
|
|
|
boolean matches = pattern.matcher(period).matches(); |
|
|
|
if (!matches){ |
|
|
|
checkWord.add("期数必须为数字"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getBePrincipal())) { |
|
|
|
checkWord.add("逾期本金不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getBePrincipal())){ |
|
|
|
String bePrincipal = excelInfo.getBePrincipal(); |
|
|
|
Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$"); |
|
|
|
boolean matches = pattern.matcher(bePrincipal).matches(); |
|
|
|
if (!matches){ |
|
|
|
checkWord.add("逾期本金必须为数字"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getBeDefInter())) { |
|
|
|
checkWord.add("逾期罚息不能为空"); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(excelInfo.getBeDefInter())){ |
|
|
|
String beDefInter = excelInfo.getBeDefInter(); |
|
|
|
Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$"); |
|
|
|
boolean matches = pattern.matcher(beDefInter).matches(); |
|
|
|
if (!matches){ |
|
|
|
checkWord.add("逾期罚息必须为数字"); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isBlank(excelInfo.getBankCollectionAcc())) { |
|
|
|
checkWord.add("资方收款账户不能为空"); |
|
|
|
break; |
|
|
|
|
dimengzhe
1 year ago