Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
2b4ef29849
|
@ -55,11 +55,13 @@ public class PrepaybillContractPlugin extends AbstractBillPlugIn implements Plug
|
|||
for (DynamicObject entryObj : goodsEntities) {
|
||||
//获取合同签订日期
|
||||
Date signdate = entryObj.getDate("signdate");
|
||||
LocalDate localDate = dateToLocalDate(signdate);
|
||||
int signdateYear = localDate.getYear();
|
||||
int currentYear = LocalDate.now().getYear();
|
||||
if(signdateYear<currentYear) {
|
||||
isMsg = true;
|
||||
if(signdate != null){
|
||||
LocalDate localDate = dateToLocalDate(signdate);
|
||||
int signdateYear = localDate.getYear();
|
||||
int currentYear = LocalDate.now().getYear();
|
||||
if(signdateYear<currentYear) {
|
||||
isMsg = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(isMsg){
|
||||
|
|
Loading…
Reference in New Issue