号源逻辑调整

main
鹿和sa0ChunLuyu 4 days ago
parent 6d21d7b059
commit e09a262ce8

@ -1814,12 +1814,10 @@ public function correctUsedCount($rosterId)
// 获取该排班上所有活跃项目及其配置 // 获取该排班上所有活跃项目及其配置
$activeItems = DB::table('s_list') $activeItems = DB::table('s_list')
->join('s_check_item', 's_list.entrust_code', '=', 's_check_item.item_code') ->leftJoin('s_check_item', 's_list.entrust_code', '=', 's_check_item.item_code')
->where('s_list.roster_id', $rosterId) ->where('s_list.roster_id', $rosterId)
->whereIn('s_list.list_status', [1, 2, 3]) ->whereIn('s_list.list_status', [1, 2, 3])
->where('s_list.is_nullify', 0) ->where('s_list.is_nullify', 0)
->where('s_check_item.status', 1)
->where('s_check_item.is_del', 0)
->select('s_list.*', 's_check_item.use_seats', 's_check_item.is_share_slot') ->select('s_list.*', 's_check_item.use_seats', 's_check_item.is_share_slot')
->get(); ->get();
@ -1912,12 +1910,10 @@ public function calculateUsedCount($rosterId)
// 获取该排班上所有活跃项目及其配置 // 获取该排班上所有活跃项目及其配置
$activeItems = DB::table('s_list') $activeItems = DB::table('s_list')
->join('s_check_item', 's_list.entrust_code', '=', 's_check_item.item_code') ->leftJoin('s_check_item', 's_list.entrust_code', '=', 's_check_item.item_code')
->where('s_list.roster_id', $rosterId) ->where('s_list.roster_id', $rosterId)
->whereIn('s_list.list_status', [1, 2, 3]) ->whereIn('s_list.list_status', [1, 2, 3])
->where('s_list.is_nullify', 0) ->where('s_list.is_nullify', 0)
->where('s_check_item.status', 1)
->where('s_check_item.is_del', 0)
->select('s_list.*', 's_check_item.use_seats', 's_check_item.is_share_slot') ->select('s_list.*', 's_check_item.use_seats', 's_check_item.is_share_slot')
->get(); ->get();

Loading…
Cancel
Save