|
@@ -2,8 +2,6 @@ package business_trip
|
|
|
|
|
|
import (
|
|
|
"hongze/hongze_mobile_admin/models/tables/business_trip"
|
|
|
- "strconv"
|
|
|
- "strings"
|
|
|
)
|
|
|
|
|
|
// ResearcherReportList
|
|
@@ -69,24 +67,23 @@ func (this *BusinessTrip) BusinessTripCalendar() {
|
|
|
groupName = "其他"
|
|
|
}
|
|
|
list[i].GroupName = groupName
|
|
|
-
|
|
|
- if item.Status == "已审批" && item.PeerPeopleId != "" {
|
|
|
- peerIdArr := strings.Split(item.PeerPeopleId, ",")
|
|
|
- peerNameArr := strings.Split(item.PeerPeopleName, ",")
|
|
|
- for k, v := range peerIdArr {
|
|
|
- peerId, err := strconv.Atoi(v)
|
|
|
- if err != nil {
|
|
|
- this.FailWithMessage("申请失败!", "同行人id失败,Err:"+err.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- peerItem := new(business_trip.BusinessTripApproveView)
|
|
|
- peerItem = item
|
|
|
- peerItem.ApplyAdminId = peerId
|
|
|
- peerItem.ApplyRealName = peerNameArr[k]
|
|
|
- peerItem.DayTotal = dayCount
|
|
|
- approveList = append(approveList, peerItem)
|
|
|
- }
|
|
|
- }
|
|
|
+ //if item.Status == "已审批" && item.PeerPeopleId != "" {
|
|
|
+ // peerIdArr := strings.Split(item.PeerPeopleId, ",")
|
|
|
+ // peerNameArr := strings.Split(item.PeerPeopleName, ",")
|
|
|
+ // for k, v := range peerIdArr {
|
|
|
+ // peerId, err := strconv.Atoi(v)
|
|
|
+ // if err != nil {
|
|
|
+ // this.FailWithMessage("申请失败!", "同行人id失败,Err:"+err.Error())
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // peerItem := new(business_trip.BusinessTripApproveView)
|
|
|
+ // peerItem = item
|
|
|
+ // peerItem.ApplyAdminId = peerId
|
|
|
+ // peerItem.ApplyRealName = peerNameArr[k]
|
|
|
+ // peerItem.DayTotal = dayCount
|
|
|
+ // approveList = append(approveList, peerItem)
|
|
|
+ // }
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
this.OkDetailed(list, "获取成功")
|