diff --git a/qyweixin/app_approve.go b/qyweixin/app_approve.go index 3b9f251..739ffc0 100644 --- a/qyweixin/app_approve.go +++ b/qyweixin/app_approve.go @@ -91,57 +91,8 @@ type AppApprove struct { } func (d *ApproveDetail) GetValue(title string) string { - - for _, content := range d.ApplyData.Contents { - - isEqual := false - for _, ti := range content.Title { - if ti.Text == title { - isEqual = true - } - } - - if !isEqual { - continue - } - - var value string - if content.Control == "Selector" { - for _, v := range content.Value.Selector.Options[0].Value { - if v.Text != "" { - value = v.Text - } - } - } else if content.Control == "Text" || content.Control == "Textarea" { - value = content.Value.Text - } else if content.Control == "Date" { - value = content.Value.Date.Timestamp - } else if content.Control == "Money" { - value = content.Value.NewMoney - } else if content.Control == "File" { - value = content.Value.Files[0].FileId - } else if content.Control == "Vacation" { //请假 : 请假类型,开始时间,结束时间,请假时长 - tp := content.Value.Vacation.Selector.Options[0].Value[0].Text - value = tp + "," + cast.ToString(content.Value.Vacation.Attendance.DateRange.NewBegin) + - "," + cast.ToString(content.Value.Vacation.Attendance.DateRange.NewEnd) + - "," + cast.ToString(content.Value.Vacation.Attendance.DateRange.NewDuration) - } else if content.Control == "PunchCorrection" { //补卡:日期,时间,状态 - mp := cast.ToStringMap(content.Value.PunchCorrection) - ddate := cast.ToString(mp["daymonthyear"]) - dtime := cast.ToString(mp["time"]) - if ddate == "" { - ddate = dtime - } - value = ddate + "," + dtime + "," + cast.ToString(mp["state"]) - } else if content.Control == "BankAccount" { - mp := cast.ToStringMap(content.Value.BankAccount) - value = cast.ToString(mp["account_type"]) + "," + cast.ToString(mp["account_name"]) + "," + cast.ToString(mp["account_number"]) - } else if content.Control == "Number" { - value = content.Value.NewNumber - } - return value - } - return "" + data := d.GetData() + return data[title] } func (d *ApproveDetail) GetData() map[string]string { @@ -223,7 +174,7 @@ func (q *AppApprove) GetDetail(spNo string) (*ApproveDetail, error) { } var rsp ApproveDetailRsp - fmt.Println("spno: %s, detail: %s", spNo, string(rspBody)) + //fmt.Println("spno: %s, detail: %s", spNo, string(rspBody)) if err := json.Unmarshal(rspBody, &rsp); err != nil { log.Errorf("get body[%s] json error :%s", string(rspBody), err.Error()) return nil, err