模式修改

@@ -14,7 +14,10 @@ type CompanyDividendsService struct {
 func (srv CompanyStatisticsService) GetDividendContracts(cmd *command.GetDividendContractsCommand) (interface{}, error) {
 func (srv CompanyStatisticsService) GetDividendContracts(cmd *command.GetDividendContractsCommand) (interface{}, error) {
 	gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 	gateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 		cmd.Operator)
 		cmd.Operator)
-	result, err := gateway.CooperationStatistics(allied_creation_cooperation.GetContractDividends, cmd)
+	result, err := gateway.CooperationStatistics(allied_creation_cooperation.GetContractDividends, map[string]interface{}{
+		"contractId": cmd.ContractId,
+		"companyId":  cmd.Operator.CompanyId,
+	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 	}
 	}

@@ -44,6 +44,7 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics
 
 
 	// 模式列表
 	// 模式列表
 	var modeStatistics []CooperationModeStatistics
 	var modeStatistics []CooperationModeStatistics
+	var responseModeStatistics []CooperationModeStatistics
 	var modeNumbers []string
 	var modeNumbers []string
 	err = json.UnmarshalFromString(json.MarshalToString(cooperationModeStatistics), &modeStatistics)
 	err = json.UnmarshalFromString(json.MarshalToString(cooperationModeStatistics), &modeStatistics)
 	if err != nil {
 	if err != nil {
@@ -54,19 +55,35 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics
 	}
 	}
 
 
 	var cooperationModes = make([]interface{}, 0)
 	var cooperationModes = make([]interface{}, 0)
-	if len(modeNumbers) > 0 {
-		models, err := gateway.CooperationModesSearch(allied_creation_cooperation.ReqCooperationModesSearch{
-			PageSize:   domain.NormalQueryRowCount,
-			PageNumber: 1,
-			CompanyId:  cmd.Operator.CompanyId,
-			//OrgId:      cmd.Operator.OrgId,
-			CooperationModeNumbers: modeNumbers,
-		})
-		if err != nil {
-			return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
-		}
+	models, err := gateway.CooperationModesSearch(allied_creation_cooperation.ReqCooperationModesSearch{
+		PageSize:   domain.NormalQueryRowCount,
+		PageNumber: 1,
+		CompanyId:  cmd.Operator.CompanyId,
+		OrgId:      cmd.Operator.OrgId,
+		//CooperationModeNumbers: modeNumbers,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+	mapModels := make(map[string]CooperationModeStatistics)
+	for i := range responseModeStatistics {
+		item := responseModeStatistics[i]
+		mapModels[item.CooperationModeNumber] = item
+	}
+	if len(models.List) > 0 {
 		for i := range models.List {
 		for i := range models.List {
 			item := models.List[i]
 			item := models.List[i]
+			if value, ok := mapModels[item.CooperationModeNumber]; !ok {
+				responseModeStatistics = append(responseModeStatistics, CooperationModeStatistics{
+					CooperationPeople:     0,
+					DividendsEstimate:     0,
+					OrderAmount:           0,
+					CooperationModeNumber: item.CooperationModeNumber,
+					SettlementAmount:      0,
+				})
+			} else {
+				responseModeStatistics = append(responseModeStatistics, value)
+			}
 			cooperationModes = append(cooperationModes, map[string]interface{}{
 			cooperationModes = append(cooperationModes, map[string]interface{}{
 				"cooperationModeId":     item.CooperationModeId,
 				"cooperationModeId":     item.CooperationModeId,
 				"cooperationModeName":   item.CooperationModeName,
 				"cooperationModeName":   item.CooperationModeName,
@@ -115,7 +132,7 @@ func (srv CompanyStatisticsService) IndexStatistics(cmd *command.IndexStatistics
 	return map[string]interface{}{
 	return map[string]interface{}{
 		"projectOverviewStatistics":       projectOverviewStatistics,
 		"projectOverviewStatistics":       projectOverviewStatistics,
 		"currentMonthDividendsStatistics": companyDividendsStatistics,
 		"currentMonthDividendsStatistics": companyDividendsStatistics,
-		"cooperationModeStatistics":       cooperationModeStatistics,
+		"cooperationModeStatistics":       responseModeStatistics,
 		"cooperationGoodsStatistics":      cooperationGoodsStatistics,
 		"cooperationGoodsStatistics":      cooperationGoodsStatistics,
 		"cooperationModes":                cooperationModes,
 		"cooperationModes":                cooperationModes,
 	}, nil
 	}, nil
@@ -202,7 +219,7 @@ type CooperationModeStatistics struct {
 	// 共创人数
 	// 共创人数
 	CooperationPeople float64 `json:"cooperationPeople"`
 	CooperationPeople float64 `json:"cooperationPeople"`
 	// 分红预算
 	// 分红预算
-	DividendsEstimate string `json:"dividendsEstimate"`
+	DividendsEstimate float64 `json:"dividendsEstimate"`
 	// 订单金额
 	// 订单金额
 	OrderAmount float64 `json:"orderAmount"`
 	OrderAmount float64 `json:"orderAmount"`
 	// 共创模式编号
 	// 共创模式编号