From c8e9bf520e472e84328ec1afe9f7b42384193c43 Mon Sep 17 00:00:00 2001 From: guosheng <gs@bronet.cn> Date: Wed, 25 Sep 2019 16:13:49 +0800 Subject: [PATCH] 随时保存问题 --- .idea/workspace.xml | 95 +++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- api/index/controller/FinanceController.php | 45 +++++++++++++++++++++++++++------------------ api/index/controller/SendController.php | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------- 3 files changed, 151 insertions(+), 132 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7133ea6..184fe6a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/FinanceController.php" afterPath="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SendController.php" afterPath="$PROJECT_DIR$/api/index/controller/SendController.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -13,27 +13,7 @@ <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="FileEditorManager"> - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="SendController.php" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="275"> - <caret line="45" column="38" lean-forward="true" selection-start-line="45" selection-start-column="38" selection-end-line="45" selection-end-column="38" /> - <folding> - <element signature="e#2747#2931#0#PHP" expanded="false" /> - <element signature="e#2936#3130#0#PHP" expanded="false" /> - <element signature="e#3136#4310#0#PHP" expanded="false" /> - <element signature="e#4315#5875#0#PHP" expanded="false" /> - <element signature="e#5881#6813#0#PHP" expanded="false" /> - <element signature="e#6818#8140#0#PHP" expanded="false" /> - <element signature="e#8146#8955#0#PHP" expanded="false" /> - <element signature="e#8960#10197#0#PHP" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> </component> <component name="FileTemplateManagerImpl"> <option name="RECENT_TEMPLATES"> @@ -60,7 +40,6 @@ <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/account.html" /> <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> - <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/statistic/index.html" /> <option value="$PROJECT_DIR$/app/admin/controller/StatisticController.php" /> <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/index.html" /> @@ -95,6 +74,7 @@ <option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" /> <option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" /> <option value="$PROJECT_DIR$/api/index/controller/SendController.php" /> + <option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" /> </list> </option> </component> @@ -112,9 +92,9 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="-57" /> - <option name="y" value="81" /> + <component name="ProjectFrameBounds"> + <option name="x" value="285" /> + <option name="y" value="92" /> <option name="width" value="1935" /> <option name="height" value="952" /> </component> @@ -229,18 +209,17 @@ <workItem from="1569315557660" duration="58000" /> <workItem from="1569389764200" duration="1390000" /> <workItem from="1569391173899" duration="1945000" /> - <workItem from="1569397269236" duration="153000" /> + <workItem from="1569397269236" duration="1915000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="360972000" /> + <option name="totallyTimeSpent" value="362734000" /> </component> <component name="ToolWindowManager"> - <frame x="-57" y="81" width="1935" height="952" extended-state="1" /> - <editor active="true" /> + <frame x="285" y="92" width="1935" height="952" extended-state="0" /> <layout> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1664" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1664" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34076828" sideWeight="0.50296295" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> @@ -457,13 +436,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="375"> - <caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-1320"> @@ -612,9 +584,37 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="340"> + <caret line="49" column="35" lean-forward="true" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" /> + <folding> + <element signature="e#300#1179#0#PHP" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="414"> + <caret line="300" column="8" lean-forward="false" selection-start-line="300" selection-start-column="8" selection-end-line="306" selection-end-column="38" /> + <folding> + <element signature="e#296#1102#0#PHP" expanded="false" /> + <element signature="e#1108#2740#0#PHP" expanded="false" /> + <element signature="e#2746#2930#0#PHP" expanded="false" /> + <element signature="e#2935#3129#0#PHP" expanded="false" /> + <element signature="e#3135#4309#0#PHP" expanded="false" /> + <element signature="e#4314#6247#0#PHP" expanded="false" /> + <element signature="e#6253#7185#0#PHP" expanded="false" /> + <element signature="e#7190#8878#0#PHP" expanded="false" /> + <element signature="e#8884#9693#0#PHP" expanded="false" /> + </folding> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-9"> + <state relative-caret-position="540"> <caret line="240" column="5" lean-forward="true" selection-start-line="240" selection-start-column="5" selection-end-line="240" selection-end-column="5" /> <folding> <element signature="e#346#543#0#PHP" expanded="false" /> @@ -652,22 +652,5 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="275"> - <caret line="45" column="38" lean-forward="true" selection-start-line="45" selection-start-column="38" selection-end-line="45" selection-end-column="38" /> - <folding> - <element signature="e#2747#2931#0#PHP" expanded="false" /> - <element signature="e#2936#3130#0#PHP" expanded="false" /> - <element signature="e#3136#4310#0#PHP" expanded="false" /> - <element signature="e#4315#5875#0#PHP" expanded="false" /> - <element signature="e#5881#6813#0#PHP" expanded="false" /> - <element signature="e#6818#8140#0#PHP" expanded="false" /> - <element signature="e#8146#8955#0#PHP" expanded="false" /> - <element signature="e#8960#10197#0#PHP" expanded="false" /> - </folding> - </state> - </provider> - </entry> </component> </project> \ No newline at end of file diff --git a/api/index/controller/FinanceController.php b/api/index/controller/FinanceController.php index ea7dbf1..fa0cfbd 100644 --- a/api/index/controller/FinanceController.php +++ b/api/index/controller/FinanceController.php @@ -45,26 +45,35 @@ class FinanceController extends RestBaseController { $user_id = $this->getUserId(); $param = $this->request->param(); - $validate = new Validate([ - 'company_name' => 'require', - 'employing' => 'require', - 'money'=>'require|number', - 'money_purpose'=>'require', - 'work_adress'=>'require', - 'user_name'=>'require', - 'user_tel'=>'require|number|max:11', - 'user_email'=>'require' - ]); - if (!$validate->check($param)) { - $this->error(['code'=>40005,'msg'=>$validate->getError()]); - } $param['user_id'] = $user_id; $param['create_time'] = time(); - $data = Db::name('finance') - ->insert($param); - if(empty($data)){ - $this->error(['code'=>40006,'msg'=>'sql执行失败']); + if($param['status'] == 0) { + $data = Db::name('job') + ->insert($param); + if (empty($data)) { + $this->error(['code' => 40006, 'msg' => 'sql执行失败']); + } + $this->success('SUCCESS'); + }else{ + $validate = new Validate([ + 'company_name' => 'require', + 'employing' => 'require', + 'money'=>'require|number', + 'money_purpose'=>'require', + 'work_adress'=>'require', + 'user_name'=>'require', + 'user_tel'=>'require|number|max:11', + 'user_email'=>'require' + ]); + if (!$validate->check($param)) { + $this->error(['code'=>40005,'msg'=>$validate->getError()]); + } + $data = Db::name('finance') + ->insert($param); + if(empty($data)){ + $this->error(['code'=>40006,'msg'=>'sql执行失败']); + } + $this->success('SUCCESS'); } - $this->success('SUCCESS'); } } \ No newline at end of file diff --git a/api/index/controller/SendController.php b/api/index/controller/SendController.php index 105e7b8..676f60b 100644 --- a/api/index/controller/SendController.php +++ b/api/index/controller/SendController.php @@ -56,7 +56,6 @@ class SendController extends RestBaseController $param['end_time'] = strtotime($param['end_time']); } } - if($param['status'] == 0){ $data = Db::name('job') ->insert($param); @@ -156,28 +155,37 @@ class SendController extends RestBaseController if(empty($param['max_age'])){ $param['max_age'] = 45; } - $validate = new Validate([ - 'job_title' => 'require', - 'city'=>'require', - 'linkman' => 'require', - 'workplace'=>'require', - 'needpeople' =>'require|number', - 'sex'=>'require|number', - 'education'=>'require', - 'company_name'=>'require', - 'empoying'=>'require', - 'content'=>'require', - 'linkman_tel'=>'require|number|max:11', - ]); - if (!$validate->check($param)) { - $this->error(['code'=>40005,'msg'=>$validate->getError()]); - } - $data = Db::name('job') - ->insert($param); - if(empty($data)){ - $this->error(['code'=>40006,'msg'=>'sql执行失败']); + if($param['status'] == 0) { + $data = Db::name('job') + ->insert($param); + if (empty($data)) { + $this->error(['code' => 40006, 'msg' => 'sql执行失败']); + } + $this->success('SUCCESS'); + }else{ + $validate = new Validate([ + 'job_title' => 'require', + 'city'=>'require', + 'linkman' => 'require', + 'workplace'=>'require', + 'needpeople' =>'require|number', + 'sex'=>'require|number', + 'education'=>'require', + 'company_name'=>'require', + 'empoying'=>'require', + 'content'=>'require', + 'linkman_tel'=>'require|number|max:11', + ]); + if (!$validate->check($param)) { + $this->error(['code'=>40005,'msg'=>$validate->getError()]); + } + $data = Db::name('job') + ->insert($param); + if(empty($data)){ + $this->error(['code'=>40006,'msg'=>'sql执行失败']); + } + $this->success('SUCCESS'); } - $this->success('SUCCESS'); } /** @@ -220,26 +228,36 @@ class SendController extends RestBaseController $param['end_time'] = strtotime($param['end_time']); } } - $validate = new Validate([ - 'job_title' => 'require', - 'linkman' => 'require', - 'linkman_tel'=>'require|number|max:11', - 'needpeople' =>'require|number', - 'payroll'=>'require|number', - 'city'=>'require', - 'adress'=>'require', - 'company_name'=>'require', - 'content'=>'require', - ]); - if (!$validate->check($param)) { - $this->error(['code'=>40005,'msg'=>$validate->getError()]); - } - $data = Db::name('job') - ->insert($param); - if(empty($data)){ - $this->error(['code'=>40006,'msg'=>'sql执行失败']); + + if($param['status'] == 0) { + $data = Db::name('job') + ->insert($param); + if (empty($data)) { + $this->error(['code' => 40006, 'msg' => 'sql执行失败']); + } + $this->success('SUCCESS'); + }else{ + $validate = new Validate([ + 'job_title' => 'require', + 'linkman' => 'require', + 'linkman_tel'=>'require|number|max:11', + 'needpeople' =>'require|number', + 'payroll'=>'require|number', + 'city'=>'require', + 'adress'=>'require', + 'company_name'=>'require', + 'content'=>'require', + ]); + if (!$validate->check($param)) { + $this->error(['code'=>40005,'msg'=>$validate->getError()]); + } + $data = Db::name('job') + ->insert($param); + if(empty($data)){ + $this->error(['code'=>40006,'msg'=>'sql执行失败']); + } + $this->success('SUCCESS'); } - $this->success('SUCCESS'); } /** @@ -280,24 +298,33 @@ class SendController extends RestBaseController $param['end_time'] = strtotime($param['end_time']); } } - $validate = new Validate([ - 'job_title' => 'require', - 'city'=>'require', - 'linkman' => 'require', - 'adress'=>'require', - 'linkman_tel'=>'require|number|max:11', - 'company_name'=>'require', - 'content'=>'require', - ]); - if (!$validate->check($param)) { - $this->error(['code'=>40005,'msg'=>$validate->getError()]); - } - $data = Db::name('job') - ->insert($param); - if(empty($data)){ - $this->error(['code'=>40006,'msg'=>'sql执行失败']); + if($param['status'] == 0) { + $data = Db::name('job') + ->insert($param); + if (empty($data)) { + $this->error(['code' => 40006, 'msg' => 'sql执行失败']); + } + $this->success('SUCCESS'); + }else{ + $validate = new Validate([ + 'job_title' => 'require', + 'city'=>'require', + 'linkman' => 'require', + 'adress'=>'require', + 'linkman_tel'=>'require|number|max:11', + 'company_name'=>'require', + 'content'=>'require', + ]); + if (!$validate->check($param)) { + $this->error(['code'=>40005,'msg'=>$validate->getError()]); + } + $data = Db::name('job') + ->insert($param); + if(empty($data)){ + $this->error(['code'=>40006,'msg'=>'sql执行失败']); + } + $this->success('SUCCESS'); } - $this->success('SUCCESS'); } } \ No newline at end of file -- libgit2 0.24.0