diff --git a/Cunkebao/app/components/acquisition/ScenarioAcquisitionCard.tsx b/Cunkebao/app/components/acquisition/ScenarioAcquisitionCard.tsx index 916b4c52c..ac5680b15 100644 --- a/Cunkebao/app/components/acquisition/ScenarioAcquisitionCard.tsx +++ b/Cunkebao/app/components/acquisition/ScenarioAcquisitionCard.tsx @@ -51,9 +51,9 @@ export function ScenarioAcquisitionCard({ ? task.reqConf.selectedDevices.length : 0 // 获客数和已添加数可根据 msgConf 或其它字段自定义 - const acquiredCount = task.stats?.acquired ?? 0 - const addedCount = task.stats?.added ?? 0 - const passRate = calculatePassRate(acquiredCount, addedCount) + const acquiredCount = task.acquiredCount ?? 0 + const addedCount = task.addedCount ?? 0 + const passRate = task.passRate ?? 0 const [menuOpen, setMenuOpen] = useState(false) const menuRef = useRef(null) @@ -166,7 +166,7 @@ export function ScenarioAcquisitionCard({ -
+
设备数
@@ -199,10 +199,6 @@ export function ScenarioAcquisitionCard({ 上次执行:{task.lastUpdated}
-
- - 下次执行:{task.nextExecutionTime} -
) diff --git a/Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php b/Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php index b47a59bea..ef71e4c68 100644 --- a/Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php +++ b/Server/application/cunkebao/controller/plan/GetPlanSceneListV1Controller.php @@ -117,7 +117,8 @@ class GetPlanSceneListV1Controller extends BaseController { return Db::name('customer_acquisition_task') ->where('sceneId', $sceneId) - ->where('status', 1) + ->where('companyId',$this->getUserInfo('companyId')) + ->where('deleteTime', 0) ->count(); } diff --git a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php index 136a3bcc6..3d9588150 100644 --- a/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php +++ b/Server/application/cunkebao/controller/plan/PlanSceneV1Controller.php @@ -50,6 +50,17 @@ class PlanSceneV1Controller extends BaseController $val['reqConf'] = json_decode($val['reqConf'],true); $val['msgConf'] = json_decode($val['msgConf'],true); $val['tagConf'] = json_decode($val['tagConf'],true); + + $val['acquiredCount'] = Db::name('task_customer')->where('task_id',$val['id'])->count(); + $val['addedCount'] = Db::name('task_customer')->where('task_id',$val['id'])->whereIn('status',[1,2,3,4])->count(); + $val['passCount'] = Db::name('task_customer')->where('task_id',$val['id'])->where('status',4)->count(); + + $val['passRate'] = 0; + if(!empty($val['passCount']) && !empty($val['addedCount'])){ + $passRate = ($val['addedCount'] / $val['passCount']) * 100; + $val['passRate'] = number_format($passRate,2); + } + } unset($val);