bugs fix export excel
This commit is contained in:
@@ -152,7 +152,7 @@ class ClaimController extends Controller
|
|||||||
$results = DB::table('claim_requests')
|
$results = DB::table('claim_requests')
|
||||||
->leftJoin('request_logs', 'claim_requests.request_log_id','=', 'request_logs.id')
|
->leftJoin('request_logs', 'claim_requests.request_log_id','=', 'request_logs.id')
|
||||||
->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
|
->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
|
||||||
->leftJoin('member_plans', 'member_plans.member_id', '=', 'members.id')
|
// ->leftJoin('member_plans', 'member_plans.member_id', '=', 'members.id')
|
||||||
->when($request->input('search'), function ($query, $search) {
|
->when($request->input('search'), function ($query, $search) {
|
||||||
$query->where(function ($query) use ($search) {
|
$query->where(function ($query) use ($search) {
|
||||||
$query->orWhere('members.name', 'like', "%" . $search . "%");
|
$query->orWhere('members.name', 'like', "%" . $search . "%");
|
||||||
@@ -192,8 +192,18 @@ class ClaimController extends Controller
|
|||||||
'),
|
'),
|
||||||
'claim_requests.created_at',
|
'claim_requests.created_at',
|
||||||
DB::raw('
|
DB::raw('
|
||||||
(SELECT plans.code FROM plans WHERE plans.id = member_plans.plan_id LIMIT 1) AS plan_code
|
(SELECT plans.code
|
||||||
|
FROM plans
|
||||||
|
WHERE plans.id IN (
|
||||||
|
SELECT member_plans.plan_id
|
||||||
|
FROM member_plans
|
||||||
|
WHERE member_plans.member_id = claim_requests.member_id
|
||||||
|
)
|
||||||
|
AND plans.service_code = claim_requests.service_code) AS plan_code
|
||||||
'),
|
'),
|
||||||
|
// DB::raw('
|
||||||
|
// (SELECT plans.code FROM plans WHERE plans.id = member_plans.plan_id LIMIT 1) AS plan_code
|
||||||
|
// '),
|
||||||
DB::raw('
|
DB::raw('
|
||||||
(SELECT services.description FROM services WHERE services.code = claim_requests.service_code LIMIT 1) AS service_code
|
(SELECT services.description FROM services WHERE services.code = claim_requests.service_code LIMIT 1) AS service_code
|
||||||
'),
|
'),
|
||||||
|
|||||||
Reference in New Issue
Block a user