Merge branch 'dev' into test

@@ -9,7 +9,7 @@ type ProductCapacitiesList struct {
 	WorkerName      string  `json:"workerName"`    // 用户姓名
 	WorkerName      string  `json:"workerName"`    // 用户姓名
 	EmployeeType    int     `json:"employeeType"`  // 员工类型  1:固定 2:派遣 3.临时
 	EmployeeType    int     `json:"employeeType"`  // 员工类型  1:固定 2:派遣 3.临时
 	ProductName     string  `json:"productName"`   //品名
 	ProductName     string  `json:"productName"`   //品名
-	ParticipateType int     `json:"participateType"` // 参与类型 1：正常 2：支援
+	WorkerOn        int     `json:"workerOn"`      //班别
 	ProductWeigh    float64 `json:"productWeigh"`  // 产能
 	ProductWeigh    float64 `json:"productWeigh"`  // 产能
 	CreatedAt       string  `json:"createdAt"`     // 创建时间
 	CreatedAt       string  `json:"createdAt"`     // 创建时间
 	ApproveStatus   int     `json:"approveStatus"` //0:未审核  1：已审核 2.自动审核
 	ApproveStatus   int     `json:"approveStatus"` //0:未审核  1：已审核 2.自动审核

@@ -195,7 +195,7 @@ func (productRecordService *ProductRecordService) ListProductCapacities(operateI
 			WorkerName:      v.ProductWorker.UserName,
 			WorkerName:      v.ProductWorker.UserName,
 			EmployeeType:    v.ProductWorker.EmployeeType,
 			EmployeeType:    v.ProductWorker.EmployeeType,
 			ProductName:     v.ProductRecordInfo.PlanProductName,
 			ProductName:     v.ProductRecordInfo.PlanProductName,
-			// ParticipateType: v.ParticipateType,
+			WorkerOn:        v.ProductRecordInfo.WorkOn,
 			ProductWeigh:    v.ProductRecordInfo.Weigh,
 			ProductWeigh:    v.ProductRecordInfo.Weigh,
 			CreatedAt:       v.CreatedAt.Format("2006-01-02"),
 			CreatedAt:       v.CreatedAt.Format("2006-01-02"),
 			ApproveStatus:   v.ProductRecordInfo.ApproveStatus,
 			ApproveStatus:   v.ProductRecordInfo.ApproveStatus,

@@ -125,8 +125,7 @@ func (repo *ProductTroubleRepository) Find(queryOptions map[string]interface{})
 		query.Where(fmt.Sprintf(`product_worker->>'userName' like '%%%v%%'`, v))
 		query.Where(fmt.Sprintf(`product_worker->>'userName' like '%%%v%%'`, v))
 	}
 	}
 
 
-	//TODO
-
+	query.Order("id", "DESC")
 	cnt, err := query.SelectAndCount()
 	cnt, err := query.SelectAndCount()
 	if err != nil {
 	if err != nil {
 		return 0, nil, err
 		return 0, nil, err