|
@@ -125,13 +125,11 @@ func (this *BusinessTrip) ApplyApprove() {
|
|
|
|
|
|
|
|
whereParams["business_apply_id"] = req.BusinessApplyId
|
|
whereParams["business_apply_id"] = req.BusinessApplyId
|
|
|
|
|
|
|
|
- var status, applyStatus string
|
|
|
|
|
|
|
+ var status string
|
|
|
if req.ApproveStatus == 1 {
|
|
if req.ApproveStatus == 1 {
|
|
|
- status = "已审批"
|
|
|
|
|
- applyStatus = "已通过"
|
|
|
|
|
|
|
+ status = "已通过"
|
|
|
} else {
|
|
} else {
|
|
|
status = "已驳回"
|
|
status = "已驳回"
|
|
|
- applyStatus = "已驳回"
|
|
|
|
|
}
|
|
}
|
|
|
updateParams["status"] = status
|
|
updateParams["status"] = status
|
|
|
updateParams["refuse_reason"] = req.RefuseReason
|
|
updateParams["refuse_reason"] = req.RefuseReason
|
|
@@ -157,7 +155,7 @@ func (this *BusinessTrip) ApplyApprove() {
|
|
|
applyItem, _ := admin.GetAdminById(businessApplyItem.ApplyAdminId)
|
|
applyItem, _ := admin.GetAdminById(businessApplyItem.ApplyAdminId)
|
|
|
wxAppPath := "pages-approve/businessTrip/detail?id=" + strconv.Itoa(req.BusinessApplyId)
|
|
wxAppPath := "pages-approve/businessTrip/detail?id=" + strconv.Itoa(req.BusinessApplyId)
|
|
|
first := "您的出差申请已被审批"
|
|
first := "您的出差申请已被审批"
|
|
|
- keyword1 := businessApplyItem.Reason + "出差申请" + applyStatus
|
|
|
|
|
|
|
+ keyword1 := businessApplyItem.Reason + "出差申请" + status
|
|
|
keyword2 := status
|
|
keyword2 := status
|
|
|
var remark string
|
|
var remark string
|
|
|
if status == "已驳回" {
|
|
if status == "已驳回" {
|
