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-07 16:38:56 +08:00
parent e2dc42701d
commit d5cc469c39
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/controller/CompanyController.php
View File

@ -24,6 +24,7 @@ use app\common\model\auth\Admin;
use app\common\model\Company; use app\common\model\Company;
use think\facade\Db; use think\facade\Db;
use app\common\logic\contract\ContractLogic; use app\common\logic\contract\ContractLogic;
use app\common\model\contract\Contract;
/** /**
* Company控制器 * Company控制器
@ -138,7 +139,8 @@ class CompanyController extends BaseAdminController
public function postsms() public function postsms()
{ {
$params = (new CompanyValidate())->goCheck('detail'); $params = (new CompanyValidate())->goCheck('detail');
$res = ContractLogic::postsms($params); $id=Contract::where('party_b', $params['id'])->value('id');
$res = ContractLogic::postsms(['id'=>$id]);
if ($res == true) { if ($res == true) {
return $this->success('发送成功', [], 1, 1); return $this->success('发送成功', [], 1, 1);
} else { } else {

3
app/api/controller/CompanyController.php
View File

@ -168,7 +168,8 @@ class CompanyController extends BaseApiController
public function postsms() public function postsms()
{ {
$params = $this->request->param(); $params = $this->request->param();
$res = ContractLogic::postsms($params); $id=Contract::where('party_b', $params['id'])->value('id');
$res = ContractLogic::postsms(['id'=>$id]);
if ($res == true) { if ($res == true) {
return $this->success('发送成功', [], 1, 1); return $this->success('发送成功', [], 1, 1);
} else { } else {

4
app/api/controller/UserController.php
View File

@ -20,6 +20,7 @@ use app\api\validate\PasswordValidate;
use app\api\validate\SetUserInfoValidate; use app\api\validate\SetUserInfoValidate;
use app\api\validate\UserValidate; use app\api\validate\UserValidate;
use app\common\logic\contract\ContractLogic; use app\common\logic\contract\ContractLogic;
use app\common\model\contract\Contract;
use Common; use Common;
use think\facade\Db; use think\facade\Db;
@ -199,7 +200,8 @@ class UserController extends BaseApiController
public function postsms() public function postsms()
{ {
$params = $this->request->param(); $params = $this->request->param();
$res = ContractLogic::postsms($params); $id=Contract::where('party_b', $params['id'])->value('id');
$res = ContractLogic::postsms(['id'=>$id]);
if ($res == true) { if ($res == true) {
return $this->success('发送成功', [], 1, 1); return $this->success('发送成功', [], 1, 1);
} else { } else {

8
app/common/logic/contract/ContractLogic.php
View File

@ -179,17 +179,15 @@ class ContractLogic extends BaseLogic
// /**发送合同 */ // /**发送合同 */
public static function Draftingcontracts($params,$type=1) public static function Draftingcontracts($params,$type=1)
{ {
self::postsms(['id'=>158]);
return true;
if($type==1){ if($type==1){
$result = CompanyLogic::detail($params); $result = CompanyLogic::detail($params);
}else{ }else{
$result = UserLogic::detail($params['id']); $result = UserLogic::detail($params['id']);
} }
if ($result && isset($result['contract']) && isset($result['contract']['file']) && $result['contract']['file'] != '') { if ($result && isset($result['contract']) && isset($result['contract']['file']) && $result['contract']['file'] != '') {
// if ($result['contract']['check_status'] == 3) { if ($result['contract']['check_status'] == 3) {
// return self::setError('你已经生成过合同,请问重复生成'); return self::setError('你已经生成过合同,请问重复生成');
// } }
if($type==1){ if($type==1){
$name=$result['company_name']; $name=$result['company_name'];
$data = [ $data = [