*

@@ -113,36 +113,33 @@ class Contract extends BaseModel
 
 
     /**
     /**
      * @param $cooperation_type
      * @param $cooperation_type
-     * @param $right
+     * @param $rightgetModel
      * @return string
      * @return string
      */
      */
     public static function getModel($cooperation_type, $right)
     public static function getModel($cooperation_type, $right)
     {
     {
+
         switch ($cooperation_type) {
         switch ($cooperation_type) {
+            case -1:
+                return '未填写';
+            case 0:
+                return '无';
             case 1:
             case 1:
                 return "一次性费用" . self::formatCost($right);
                 return "一次性费用" . self::formatCost($right);
-                break;
             case 2:
             case 2:
                 return "分成" . self::formatDivide($right);
                 return "分成" . self::formatDivide($right);
-                break;
             case 3:
             case 3:
                 return '分成' . self::formatDivide($right) .'+预付'. self::formatPrepaid($right);
                 return '分成' . self::formatDivide($right) .'+预付'. self::formatPrepaid($right);
-                break;
             case 5:
             case 5:
                 return '分成' . self::formatDivide($right) .'+一次性费用'. self::formatCost($right);
                 return '分成' . self::formatDivide($right) .'+一次性费用'. self::formatCost($right);
-                break;
             case 6:
             case 6:
                 return '抵扣成本后再分成' . self::formatDivide($right);
                 return '抵扣成本后再分成' . self::formatDivide($right);
-                break;
             case 7:
             case 7:
                 return '分成' . self::formatDivide($right) . '+预付' .self::formatPrepaid($right). '+一次性费用' . self::formatCost($right);
                 return '分成' . self::formatDivide($right) . '+预付' .self::formatPrepaid($right). '+一次性费用' . self::formatCost($right);
-                break;
             case 8:
             case 8:
                 return '抵扣成本后分成' .self::formatDivide($right). '+预付' . self::formatPrepaid($right);
                 return '抵扣成本后分成' .self::formatDivide($right). '+预付' . self::formatPrepaid($right);
-                break;
             case 9:
             case 9:
                 return '一次性费用' . self::formatCost($right) .'+抵扣成本后分成' . self::formatDivide($right);
                 return '一次性费用' . self::formatCost($right) .'+抵扣成本后分成' . self::formatDivide($right);
-                break;
         }
         }
     }
     }
 
 

@@ -236,7 +236,7 @@ class MusicianSongService extends Service
                         //新数据
                         //新数据
                         $rights[] = [
                         $rights[] = [
                             'role'  =>  Contract::transformRole($stakeholder_contract['right_type']),
                             'role'  =>  Contract::transformRole($stakeholder_contract['right_type']),
-                            'right' =>  'test',
+                            'right' =>  Contract::getModel($item['contract']['cooperation_type'], [$stakeholder_contract]),
                         ];
                         ];
                     }
                     }
                 }
                 }