mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mkm' of https://gitea.lihaink.cn/mkm/TaskSystem into mkm

Browse Source
This commit is contained in:
mkm 2023-09-11 11:34:36 +08:00
commit a03b29f00e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/adminapi/controller/contract/ContractController.php
View File

@ -181,15 +181,16 @@ class ContractController extends BaseAdminController
public function evidence() public function evidence()
{ {
$parms = Request::param(); $id = Request::param('id');
$detail=ContractLogic::detail($parms); $detail=Contract::where('id',$id)->find();
if(!empty($detail['evidence_url'])){ if(!empty($detail['evidence_url'])){
return $this->success('获取成功', ['url' => env('url.url_prefix').$detail['evidence_url']]); return $this->success('获取成功', ['url' => env('url.url_prefix').$detail['evidence_url']]);
} }
$company=Company::where('id',$detail['party_a'])->find();
$request = array( $request = array(
"applyNo" => $detail['contract_no'], "applyNo" => $detail['contract_no'],
"fullName" => $detail['party_a_info']['company_name'], "fullName" => $company['company_name'],
"identityCard" => $detail['party_a_info']['organization_code'], "identityCard" => $company['organization_code'],
"identityType" => 12, "identityType" => 12,
); );
return app(JunziqianController::class)->EvidenceDownload($request); return app(JunziqianController::class)->EvidenceDownload($request);

2
app/api/controller/TaskController.php
View File

@ -93,9 +93,11 @@ class TaskController extends BaseApiController
$parmas['start_time']=date('Y-m-d',$task['start_time']); $parmas['start_time']=date('Y-m-d',$task['start_time']);
$parmas['end_time']=$task['end_time'].' 23:59:59'; $parmas['end_time']=$task['end_time'].' 23:59:59';
$list = App(RemoteController::class)->shang_date_list($company, 1, $parmas); $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
$shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,$parmas);
if ($task != false) { if ($task != false) {
$find['list'] = $list; $find['list'] = $list;
$find['extend']=$task['extend']; $find['extend']=$task['extend'];
$find['extend']['transaction']['arr']['total_price']=$shang_date_total_price['arr']['total_price']??0;
if($transaction_pool==0){ if($transaction_pool==0){
$find['transaction_pool']=0; $find['transaction_pool']=0;
}else{ }else{

1
app/common/logic/task/TaskLogic.php
View File

@ -74,7 +74,6 @@ class TaskLogic extends BaseLogic
public static function CronAdd(array $v, $datas): bool public static function CronAdd(array $v, $datas): bool
{ {
try { try {
$v['day_count']=$v['day_count']+1;
if ($v['types'] == 3) { if ($v['types'] == 3) {
$task = Task::where('template_id', $v['id'])->find(); $task = Task::where('template_id', $v['id'])->find();
if ($task) { if ($task) {