正在显示
3 个修改的文件
包含
6 行增加
和
0 行删除
| @@ -156,8 +156,10 @@ class ComController extends BaseController | @@ -156,8 +156,10 @@ class ComController extends BaseController | ||
| 156 | // 获取上个月的结束时间 | 156 | // 获取上个月的结束时间 |
| 157 | $endTime = Carbon::now()->subMonth()->endOfMonth(); | 157 | $endTime = Carbon::now()->subMonth()->endOfMonth(); |
| 158 | foreach ($data as $k => $v){ | 158 | foreach ($data as $k => $v){ |
| 159 | + if($startTime <= $v['submit_time']){ | ||
| 159 | 160 | ||
| 160 | } | 161 | } |
| 162 | + } | ||
| 161 | $this->response('success',Code::SUCCESS,$inquiry_list); | 163 | $this->response('success',Code::SUCCESS,$inquiry_list); |
| 162 | } | 164 | } |
| 163 | 165 |
| @@ -23,6 +23,8 @@ class ATemplateLogic extends BaseLogic | @@ -23,6 +23,8 @@ class ATemplateLogic extends BaseLogic | ||
| 23 | * @time :2023/6/28 17:03 | 23 | * @time :2023/6/28 17:03 |
| 24 | */ | 24 | */ |
| 25 | public function aTemplateList($map,$page,$row,$order = ['created_at'],$filed = ['id','name','status','deleted_status','sort','image']){ | 25 | public function aTemplateList($map,$page,$row,$order = ['created_at'],$filed = ['id','name','status','deleted_status','sort','image']){ |
| 26 | + $map['deleted_status'] = 0; | ||
| 27 | + $map['status'] = 0; | ||
| 26 | $lists = $this->model->lists($map,$page,$row,$order,$filed); | 28 | $lists = $this->model->lists($map,$page,$row,$order,$filed); |
| 27 | return $this->success($lists); | 29 | return $this->success($lists); |
| 28 | } | 30 | } |
| @@ -30,6 +30,8 @@ class ATemplateModuleLogic extends BaseLogic | @@ -30,6 +30,8 @@ class ATemplateModuleLogic extends BaseLogic | ||
| 30 | * @time :2023/6/28 18:01 | 30 | * @time :2023/6/28 18:01 |
| 31 | */ | 31 | */ |
| 32 | public function aTemplateModuleLists($map,$page,$row,$order = 'created_at',$filed = ['*']){ | 32 | public function aTemplateModuleLists($map,$page,$row,$order = 'created_at',$filed = ['*']){ |
| 33 | + $map['deleted_status'] = 0; | ||
| 34 | + $map['status'] = 0; | ||
| 33 | $lists = $this->model->lists($map,$page,$row,$order,$filed); | 35 | $lists = $this->model->lists($map,$page,$row,$order,$filed); |
| 34 | return $this->success($lists); | 36 | return $this->success($lists); |
| 35 | } | 37 | } |
-
请 注册 或 登录 后发表评论