Merge pull request '原材料分析' (#127) from fix_daolu into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/127

services/ap/implments/CustDemandVerHead.service.impl.go

@@ -770,10 +770,9 @@ func (impl *CustDemandVerHeadServiceImplement) SelectUnique(user *global.User, u
 	detailDao := dal.NewCustDemandVerDetailDAO(session, user.PlantNr, user.UserId)
 
 	//获取当前周
-	nowTime := time.Now()
+	nowTime := utils.GetZeroTime(time.Now())
 	details, err := detailDao.SelectDistinct([]grmi.Predicate{
-		meta.CustDemandVerDetail_DemandYear.NewPredicate(grmi.Equal, nowTime.Year()),
-		meta.CustDemandVerDetail_DemandWeek.NewPredicate(grmi.GreaterThen, utils.WeekByDate(nowTime)),
+		meta.CustDemandVerDetail_DemandDate.NewPredicate(grmi.GreaterThen, nowTime),
 		meta.CustDemandVerDetail_Status.NewPredicate(grmi.Equal, baseModel.STATUS_YES),
 	}, nil)
 	if err != nil {