diff --git a/api/v1/assessment/department_target.go b/api/v1/assessment/department_target.go index f88fb40..cb89378 100644 --- a/api/v1/assessment/department_target.go +++ b/api/v1/assessment/department_target.go @@ -159,11 +159,11 @@ func (d *DutyHandle) DepartmentTaskList(c *gin.Context) { listTargetErr := gormDb.Joins("left join dutyclass on id = qe_dimension").Order("qe_group asc,qe_accept_evaluation asc,sort asc,qe_type asc,qe_target asc,qe_target_sun asc").Find(&qualitativeEvaluationAry).Error if listTargetErr != nil || len(qualitativeEvaluationAry) < 1 { - response.Result(101, qualitativeEvaluationAry, "没有数据!", c) + response.Result(101, qualitativeEvaluationAry, "没有数2据!", c) return } - response.Result(101, qualitativeEvaluationAry, "没有数据!", c) - return + // response.Result(101, qualitativeEvaluationAry, "没有数1据!", c) + // return var uotContAry []TargetContOutCont for _, v := range qualitativeEvaluationAry { var uotCont TargetContOutCont diff --git a/api/v1/fileuploaddownload/fileupdowntype.go b/api/v1/fileuploaddownload/fileupdowntype.go index f549cff..3d84853 100644 --- a/api/v1/fileuploaddownload/fileupdowntype.go +++ b/api/v1/fileuploaddownload/fileupdowntype.go @@ -18,7 +18,7 @@ import ( // 上传文件返回前端 type UpLoadFileStruct struct { - ID int64 `json:"ID"` + ID int64 `json:"id"` Key string `json:"key"` Name string `json:"name"` Tag string `json:"tag"` diff --git a/commonus/publichaneld.go b/commonus/publichaneld.go index e7154f7..693260d 100644 --- a/commonus/publichaneld.go +++ b/commonus/publichaneld.go @@ -4319,7 +4319,7 @@ func WriteReplyLog(orderId, acceptDepartment, launchDepartment, launchUser, stat @resultval 结算值 @allPrizes 全奖值 @zeroPrizes 零奖值 -@CappingVals 封顶值 +@CappingVals 封顶值 @typeClass 1:定性;2:定量;3:观察指标 返回说明 diff --git a/gin_server_admin b/gin_server_admin index 7f6c574..d33e3d1 100644 Binary files a/gin_server_admin and b/gin_server_admin differ