diff --git a/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java b/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java index af284c8..c05b222 100644 --- a/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java +++ b/src/com/engine/attendance/workflow/web/BusinessTripsApplyApi.java @@ -2,11 +2,9 @@ package com.engine.attendance.workflow.web; import com.engine.attendance.workflow.service.BusinessTripsApplyService; import com.engine.attendance.workflow.service.impl.BusinessTripsApplyServiceImpl; +import com.engine.common.util.ApiReturnTools; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.jucailin.service.KQCalendarSettingService; -import com.engine.jucailin.service.impl.KQCalendarSettingServiceImpl; -import com.engine.jucailin.util.ResponseResult; import lombok.extern.slf4j.Slf4j; import weaver.hrm.HrmUserVarify; import weaver.hrm.User; @@ -40,9 +38,14 @@ public class BusinessTripsApplyApi { @Path("/getBusinessTripsApplyList") @Produces(MediaType.APPLICATION_JSON) public String getBusinessTripsApplyList(@Context HttpServletRequest request, @Context HttpServletResponse response) { - User user = HrmUserVarify.getUser(request, response); - Map param = ParamUtil.request2Map(request); - return new ResponseResult, Map>(user).run(getBusinessTripsApplyService(user) :: getBusinessTripsApplyList,param); + try { + User user = HrmUserVarify.getUser(request, response); + Map param = ParamUtil.request2Map(request); + return ApiReturnTools.success(getBusinessTripsApplyService(user).getBusinessTripsApplyList(param)); + }catch (Exception e){ + log.error("execute fail,catch error: [{}]",e); + return ApiReturnTools.error("500","getBusinessTripsApplyList error"); + } } }