|
@@ -65,6 +65,11 @@ func (this *BusinessTrip) ApplyAdd() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ if req.Itinerary == "" {
|
|
|
+ this.FailWithMessage("请填写行程说明", "请填写行程说明")
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
startP, _ := time.ParseInLocation(utils.FormatDate, req.ArriveDate, time.Local)
|
|
|
endP, _ := time.ParseInLocation(utils.FormatDate, req.ReturnDate, time.Local)
|
|
|
nowDate, _ := time.ParseInLocation(utils.FormatDate, time.Now().Format(utils.FormatDate), time.Local)
|
|
@@ -163,6 +168,7 @@ func (this *BusinessTrip) ApplyAdd() {
|
|
|
item.ApproveName = approveItem.RealName
|
|
|
item.CreateTime = time.Now()
|
|
|
item.ModifyTime = time.Now()
|
|
|
+ item.Itinerary = req.Itinerary
|
|
|
applyId, err := business_trip.AddBusinessApply(item)
|
|
|
if err != nil {
|
|
|
this.FailWithMessage("申请失败", "申请失败,Err:"+err.Error())
|
|
@@ -281,6 +287,11 @@ func (this *BusinessTrip) ApplyEdit() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ if req.Itinerary == "" {
|
|
|
+ this.FailWithMessage("请填写行程说明", "请填写行程说明")
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
startP, _ := time.ParseInLocation(utils.FormatDate, req.ArriveDate, time.Local)
|
|
|
endP, _ := time.ParseInLocation(utils.FormatDate, req.ReturnDate, time.Local)
|
|
|
nowDate, _ := time.ParseInLocation(utils.FormatDate, time.Now().Format(utils.FormatDate), time.Local)
|
|
@@ -397,6 +408,7 @@ func (this *BusinessTrip) ApplyEdit() {
|
|
|
updateParams["refuse_reason"] = ""
|
|
|
updateParams["create_time"] = time.Now()
|
|
|
updateParams["modify_time"] = time.Now()
|
|
|
+ updateParams["itinerary"] = req.Itinerary
|
|
|
|
|
|
err = business_trip.UpdateBusinessApply(whereParams, updateParams)
|
|
|
if err != nil {
|