员工信息接口优化

Signed-off-by: houhezheng <houhezheng@romens.cn>

backend/config/urlmanager.php

@@ -24,8 +24,8 @@ return [
                         'POST login'=>'login',
                         'GET,OPTIONS department'=>'department',
                         'GET,OPTIONS user-complain'=>'user-complain',
-                        'GET employee-info' => 'employee-info',
-                        'GET employee-list' => 'employee-list',
+                        'GET,OPTIONS employee-info' => 'employee-info',
+                        'GET,OPTIONS employee-list' => 'employee-list',
                         'GET,OPTIONS list' => 'list',
                         'GET,OPTIONS one' => 'one',
                         'PUT,OPTIONS revise' => 'revise',

backend/controllers/v1/shopuser/ShopUserController.php

@@ -21,13 +21,13 @@ class ShopUserController extends BaseController
      *   @OA\Parameter(name="NAME",in="query",description="员工姓名",@OA\Schema(type="string")),
      *   @OA\Parameter(name="EMPLOYEE_CODE",in="query",description="员工编号",@OA\Schema(type="string")),
      *   @OA\Parameter(name="MOBILEPHONE",in="query",description="手机号",@OA\Schema(type="string")),
-     *   @OA\Parameter(name="EMPLOYEE_BRANCH_GUID",description="用户所属门店GUID",in="query",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="EMPLOYEE_BRANCH_NAME",description="用户所属门店",in="query",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
      *                GUID:用户GUID,
      *                NAME:姓名,
      *                EMPLOYEE_CODE:员工编号,
      *                MOBILE_PHONE:手机号,
-     *                EMPLOYEE_BRANCH_GUID:用户所属门店GUID"),
+     *                EMPLOYEE_BRANCH_NAME:用户所属门店"),
      *   security={{"Authorization": {}}}
      * )
      */
@@ -64,7 +64,7 @@ class ShopUserController extends BaseController
      *                MEMBER_NO:会员卡号,
      *                IS_DISTRIBUTOR:分销商标识（0：否，1：是）,
      *                EMPLOYEE_IS_MANAGER:员工是否为门店店长,
-     *                EMPLOYEE_BRANCH_GUID:用户所属门店GUID"),
+     *                BRANCH_CODE:用户所属门店编号"),
      *   security={{"Authorization": {}}}
      * )
      */

backend/models/v1/shopuser/ShopUser.php

@@ -71,6 +71,8 @@ use yii\data\ActiveDataProvider;
  */
 class ShopUser extends BaseModel
 {
+    public $BRANCH_CODE; //别名（所属门店别名）
+
     /**
      * {@inheritdoc}
      */
@@ -99,8 +101,8 @@ class ShopUser extends BaseModel
             [['IS_FOCUSON', 'CRM_CUSTOMER_ID', 'USER_REGION_NUMBER', 'USER_SELF_NUMBER'], 'string', 'max' => 20],
             [['LABEL', 'SHARE_QRPATH', 'HS_SHAREQR_PATH', 'HSDIS_PARENT_GUID'], 'string', 'max' => 200],
             [['ALIPAYAC_COUNT'], 'string', 'max' => 30],
-            [['CODE'], 'unique'],
-            [['GUID'], 'unique'],
+            [['CODE'], 'unique','on'=>['creation']],
+            [['GUID'], 'unique','on'=>['creation']],
         ];
     }
 
@@ -180,30 +182,32 @@ class ShopUser extends BaseModel
      */
     public function employeeSearch($params)
     {
-        $query = static::find()->select('GUID,NAME,EMPLOYEE_CODE,MOBILE_PHONE,EMPLOYEE_BRANCH_GUID')
-            ->where(['BELONG' => 1]);
+        $query = static::find()->alias('su')
+            ->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,sb.NAME as SHOP_BRANCH_NAME')
+            ->leftJoin('shop_branch sb','sb.GUID=su.EMPLOYEE_BRANCH_GUID')
+            ->where(['su.BELONG' => 1]);
 
         if (isset($params['NAME']) && !empty($params['NAME'])) {
-            $query->andWhere(['like', 'NAME', $params['NAME']]);
+            $query->andWhere(['like', 'su.NAME', $params['NAME']]);
         }
 
         if (isset($params['EMPLOYEE_CODE']) && !empty($params['EMPLOYEE_CODE'])) {
-            $query->andWhere(['like', 'EMPLOYEE_CODE', $params['EMPLOYEE_CODE']]);
+            $query->andWhere(['like', 'su.EMPLOYEE_CODE', $params['EMPLOYEE_CODE']]);
         }
 
         if (isset($params['MOBILEPHONE']) && !empty($params['MOBILEPHONE'])) {
-            $query->andWhere(['like', 'MOBILEPHONE', $params['MOBILEPHONE']]);
+            $query->andWhere(['like', 'su.MOBILEPHONE', $params['MOBILEPHONE']]);
         }
 
-        if (isset($params['EMPLOYEE_BRANCH_GUID']) && !empty($params['EMPLOYEE_BRANCH_GUID'])) {
-            $query->andWhere(['like', 'EMPLOYEE_BRANCH_GUID', $params['EMPLOYEE_BRANCH_GUID']]);
+        if (isset($params['EMPLOYEE_BRANCH_NAME']) && !empty($params['EMPLOYEE_BRANCH_NAME'])) {
+            $query->andWhere(['like', 'sb.NAME', $params['EMPLOYEE_BRANCH_NAME']]);
         }
 
         return new ActiveDataProvider(
             [
                 'query' => $query->asArray(),
                 'pagination' => [
-                    'pageSize' =>  15,
+                    'pageSize' =>  10,
                 ]
             ]
         );
@@ -217,9 +221,17 @@ class ShopUser extends BaseModel
      */
     public function employeeInfo($id)
     {
-        $info = static::find()->select('GUID,NAME,EMPLOYEE_CODE,MOBILE_PHONE,AGE,CONTACT_SEX,MEMBER_NO,IS_DISTRIBUTOR,EMPLOYEE_IS_MANAGER,EMPLOYEE_BRANCH_GUID')
-            ->where(['GUID' => $id, 'BELONG' => 1])
+        $this->setAttributes('BRANCH_CODE');
+        $info = static::find()->alias('su')
+            ->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.AGE,su.CONTACT_SEX,su.MEMBER_NO,su.IS_DISTRIBUTOR,su.EMPLOYEE_IS_MANAGER,sb.CODE as BRANCH_CODE')
+            ->leftJoin('shop_branch sb','sb.GUID=su.EMPLOYEE_BRANCH_GUID')
+            ->where(['su.GUID' => $id, 'su.BELONG' => 1])
             ->one();
         return $info;
     }
+
+    public function fields()
+    {
+        return ['GUID','NAME','EMPLOYEE_CODE','MOBILE_PHONE','AGE','CONTACT_SEX','MEMBER_NO','IS_DISTRIBUTOR','EMPLOYEE_IS_MANAGER','BRANCH_CODE'];
+    }
 }