作者 张关杰

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

... ... @@ -26,6 +26,7 @@ class MonthCountLogic extends BaseLogic
* @time :2023/7/3 9:39
*/
public function getCountLists($map,$page,$row = 10,$order = 'created_at',$filed = ['*']){
$map['project_id'] = $this->user['project_id'];
$lists = $this->model->lists($map,$page,$row,$order,$filed);
if(!empty($lists)){
$lists['list']['new'] = $this->currentMonthCount();
... ... @@ -162,6 +163,9 @@ class MonthCountLogic extends BaseLogic
$count = new Count();
$startTime = date("Y-m-d", strtotime("-9 months", mktime(0, 0, 0)));
$ensTime = date('Y-m-d',time());
var_dump($startTime);
var_dump($ensTime);
die();
$lists = $count->read(['date'=>['between',[$startTime,$ensTime]]]);
return $this->success($lists);
}
... ...