方法修改，修改薪资列表，添加分页查询

yinbentan

2024-08-30 cc7c2094568ea8f9d1697da5ed0a2c759ca81abd

 controllers/salary_plan_controller.go

@@ -317,6 +317,8 @@
//   @Param        object  query    request.PayrollSalaryPlan true  "查询参数"
//   @Success   200      {object}   util.ResponseList{data=[]models.PayrollSalaryPlan}   "成功"
//   @Router      /api-jl/v1/salary/getPayrollSalaryPlanList [get]
//
// Deprecated: 此方法将在未来版本中删除
func (slf SalaryPlanController) GetPayrollSalaryPlanList(c *gin.Context) {
   var params request.PayrollSalaryPlan
   if err := c.ShouldBindQuery(&params); err != nil {
@@ -377,7 +379,7 @@
   }
   constitute.CreatedBy = info.NickName

   if payrollConstitute, err := models.NewPayrollConstituteSearch().SetCycle(params.Cycle).SetWorkerID(params.WorkerID).SetSalaryPlanId(params.SalaryPlanId).First(); err != nil && payrollConstitute != nil {
   if payrollConstitute, err := models.NewPayrollConstituteSearch().SetCycle(params.Cycle).SetWorkerID(params.WorkerID).SetSalaryPlanId(params.SalaryPlanId).First(); err == nil && payrollConstitute != nil {
      constitute.ID = payrollConstitute.ID
      constitute.CreatedAt = payrollConstitute.CreatedAt
   }
@@ -385,7 +387,7 @@
   if constitute.ID > 0 {
      err = models.NewPayrollConstituteSearch().Save(&constitute)
      if err != nil {
         util.ResponseFormat(c, code.RequestParamError, "保存失败")
         util.ResponseFormat(c, code.RequestParamError, "更新失败")
         return
      }
   } else {
@@ -416,33 +418,40 @@
      return
   }
   if len(params.Cycle) == 0 {
      util.ResponseFormat(c, code.RequestParamError, "请检查查询周期。格式：Cycle（yyyy-MM-dd）")
      util.ResponseFormat(c, code.RequestParamError, "请检查查询周期。格式：Cycle（yyyy-MM）")
      return
   }

   groupList, err := models.NewPayrollConstituteSearch().ConstituteGroup(&models.ConstituteGroup{Cycle: params.Cycle})
   groupSearch := &models.ConstituteGroupSearch{PageNum: params.Page, PageSize: params.PageSize}
   groupSearch.Cycle = params.Cycle
   groupSearch.WorkerID = params.WorkerID
   groupSearch.WorkTypeCode = constvar.JobType(params.WorkTypeCode)
   groupList, err := models.NewPayrollConstituteSearch().ConstituteGroup(groupSearch)
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "查找工资分类失败")
      return
   }

   groupMap := make(map[string][]*models.ConstituteGroup, 0)
   workerIds := make([]string, 0)
   for _, group := range groupList {
      if _, ok := groupMap[group.WorkerID]; ok {
         groupMap[group.WorkerID] = append(groupMap[group.WorkerID], group)
      } else {
         groupMap[group.WorkerID] = []*models.ConstituteGroup{group}
      }
      workerIds = append(workerIds, group.WorkerID)
   }

   // 员工信息
   workers, err := models.NewWorkerSearch().FindNotTotal()
   workers, total, err := models.NewWorkerSearch().SetOrder("id").SetPage(params.Page, params.PageSize).SetIds(workerIds).Find()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "查找用户失败")
   }
   workerMap := make(map[string]*models.Worker)
   for _, worker := range workers {
      workerMap[worker.ID] = worker
   }
   /*   workerMap := make(map[string]*models.Worker)
      for _, worker := range workers {
         workerMap[worker.ID] = worker
      }*/

   // 工资方案
   salaryPlans, err := models.NewSalaryPlanSearch().FindNotTotal()
@@ -455,7 +464,10 @@
   }

   // 工资单项
   constituteList, err := models.NewPayrollConstituteSearch().SetCycle(params.Cycle).SetWorkerID(params.WorkerID).SetWorkTypeID(uint(params.WorkTypeID)).SetWorkTypeCode(params.WorkTypeCode).FindNotTotal()
   constituteList, err := models.NewPayrollConstituteSearch().
      SetCycle(params.Cycle).SetWorkerID(params.WorkerID).SetWorkTypeID(uint(params.WorkTypeID)).SetWorkTypeCode(params.WorkTypeCode).
      SetWorkerIDs(workerIds).
      FindNotTotal()
   if err != nil {
      util.ResponseFormat(c, code.RequestParamError, "查找工资单项失败")
      return
@@ -467,7 +479,38 @@
   }

   var list []map[string]interface{}
   for workerId, group := range groupMap {

   for _, worker := range workers {
      result := make(map[string]interface{})
      result["cycle"] = params.Cycle
      result["worker"] = worker

      amount := decimal.NewFromInt(0)
      constituteList := make([]map[string]interface{}, 0)
      if group, ok := groupMap[worker.ID]; ok { // 人员信息
         for _, v := range group {
            temp := make(map[string]interface{})
            temp["salaryPlanId"] = v.SalaryPlanId
            if _, ok := salaryPlanMap[v.SalaryPlanId]; ok {
               temp["salaryPlan"] = salaryPlanMap[v.SalaryPlanId] // 薪资方案
            }

            key := fmt.Sprintf("%v%v%v", v.Cycle, v.WorkerID, v.SalaryPlanId)
            if payrollConstitute, ok := constituteMap[key]; ok {
               temp["amount"] = payrollConstitute.Amount
               amount = amount.Add(payrollConstitute.Amount)
            }
            constituteList = append(constituteList, temp)
         }
      }
      result["amount"] = amount       // 应发工资
      result["list"] = constituteList // 工资详情
      result["remark"] = "备注信息"       // 备注信息

      list = append(list, result)
   }

   /*   for workerId, group := range groupMap {
      result := make(map[string]interface{})
      result["cycle"] = params.Cycle
      if _, ok := workerMap[workerId]; ok { // 人员信息
@@ -490,10 +533,11 @@
      }
      result["amount"] = amount       // 应发工资
      result["list"] = constituteList // 工资详情
      result["remark"] = "备注信息"       // 备注信息

      list = append(list, result)
   }
   }*/

   util.ResponseFormat(c, code.Success, list)
   util.ResponseFormatList(c, code.Success, list, total)

}