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

更新

Browse Source
This commit is contained in:
mkm 2023-08-30 14:28:18 +08:00
parent 7977019af0
commit da19c96d4e
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/api/controller/CeshiController.php
View File

@ -1,16 +1,16 @@
<?php
namespace app\api\controller;
use app\common\logic\finance\ShareProfit;
use app\common\logic\task\TaskLogic;
use app\common\model\Company;
use app\common\model\company\CompanyAccountLog;
use app\common\model\task\Task;
use app\common\model\task_scheduling\TaskScheduling;
use app\common\model\task_scheduling_plan\TaskSchedulingPlan;
use app\common\model\task_template\TaskTemplate;
use app\common\model\user\User as UserModel;
use app\common\model\user\UserAccountLog;
use think\facade\Log;
use app\job\TaskInformationJob;
use Symfony\Component\HttpClient\HttpClient;
class CeshiController extends BaseApiController
{
@ -21,20 +21,21 @@ class CeshiController extends BaseApiController
*/
public function index()
{
$user_ids = User::where('company_id', $datas['company_id'])->where('is_captain', 1)->field('id,nickname,brigade')->select();
$director_uid = Task::where('id', $datas['task_id'])->value('director_uid');
$shareholder_user = User::where('id', $director_uid)->field('id,nickname,brigade')->find();
$money=bcdiv($data['money'],count($user_ids),2);
$user_ids = UserModel::where('company_id', 175)->where('is_captain', 1)->field('id,nickname,brigade')->select();
$shareholder_user = UserModel::where('id', 322)->field('id,nickname,brigade')->find();
$money=bcdiv(6000,count($user_ids),2);
$left_amount=0;
foreach ($user_ids as $kkk => $vvv) {
$left_amount+=bcadd(1000,$money,2);
$company_log = [
'sn' => generate_sn(UserAccountLog::class, 'sn', 20),
'company_id'=>$datas['company_id'],
'company_id'=>175,
'change_object' => CompanyAccountLog::SHAREHOLDER,//变动对象
'change_type' => CompanyAccountLog::TASK_INC_SHAREHOLDER_MONEY,//变动类型
'action' => CompanyAccountLog::INC,//1-增加 2-减少
'left_amount' =>bcadd($company['shareholder_money'],$money,2),//变动后数量
'left_amount' =>$left_amount,//变动后数量
'change_amount' => $money,//变动数量
'remark' =>$shareholder_user['nickname'].'完成了'.$vvv['brigade'].'队的股金:',
'remark' =>$shareholder_user['nickname'].'完成了'.$vvv['brigade'].'队的股金:'.$money.'元',
'status'=>1,
];
CompanyAccountLog::create($company_log);

8
app/common/logic/finance/ShareProfit.php
View File

@ -7,7 +7,7 @@ use app\common\logic\AccountLogLogic;
use app\common\model\Company;
use app\common\model\company\CompanyAccountLog;
use app\common\model\task\Task;
use app\common\model\task_scheduling_plan\TaskSchedulingPlan;
use app\common\model\user\UserAccountLog;
use app\common\model\user\User;
use think\facade\Db;
use think\facade\Log;
@ -71,16 +71,18 @@ class ShareProfit
$director_uid = Task::where('id', $datas['task_id'])->value('director_uid');
$shareholder_user = User::where('id', $director_uid)->field('id,nickname,brigade')->find();
$money=bcdiv($data['money'],count($user_ids),2);
$left_amount=0;
foreach ($user_ids as $kkk => $vvv) {
$left_amount+=bcadd(1000,$money,2);
$company_log = [
'sn' => generate_sn(UserAccountLog::class, 'sn', 20),
'company_id'=>$datas['company_id'],
'change_object' => CompanyAccountLog::SHAREHOLDER,//变动对象
'change_type' => CompanyAccountLog::TASK_INC_SHAREHOLDER_MONEY,//变动类型
'action' => CompanyAccountLog::INC,//1-增加 2-减少
'left_amount' =>bcadd($company['shareholder_money'],$money,2),//变动后数量
'left_amount' =>$left_amount,//变动后数量
'change_amount' => $money,//变动数量
'remark' =>$shareholder_user['nickname'].'完成了'.$vvv['brigade'].'队的股金:',
'remark' =>$shareholder_user['nickname'].'完成了'.$vvv['brigade'].'队的股金:'.$money.'元',
'status'=>1,
];
CompanyAccountLog::create($company_log);