|
@@ -62,10 +62,16 @@ class TeaplanService extends CrudService {
|
|
|
// 比较结束日期 如果大于0 为不在此区间
|
|
|
const sres = moment(curdate).diff(moment(startdate), 'days');
|
|
|
const eres = moment(curdate).diff(moment(enddate), 'days');
|
|
|
+ console.log('curdate--' + curdate);
|
|
|
+ console.log('startdate--' + startdate);
|
|
|
+ console.log('enddate--' + enddate);
|
|
|
+ console.log('111--' + sres);
|
|
|
+ console.log('222--' + eres);
|
|
|
let result = true;
|
|
|
if (sres < 0 || eres > 0) {
|
|
|
result = false;
|
|
|
}
|
|
|
+ console.log('333--' + result);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
@@ -73,7 +79,7 @@ class TeaplanService extends CrudService {
|
|
|
async teacheriswork(nodates, startdate, enddate) {
|
|
|
let result = true;
|
|
|
for (const nodate of nodates) {
|
|
|
- const res = this.betweendate(nodate, startdate, enddate);
|
|
|
+ const res = await this.betweendate(nodate, startdate, enddate);
|
|
|
if (res) {
|
|
|
result = false;
|
|
|
break;
|