diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java index 8bb492e..45ea1ba 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java @@ -5,7 +5,14 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.database.domain.ApprovalProcess; +import com.ruoyi.database.domain.BusinessTripApproval; +import com.ruoyi.database.domain.NonWorkingDayDrinkingReport; +import com.ruoyi.database.domain.PoliceLeaveApproval; +import com.ruoyi.database.mapper.PoliceLeaveApprovalMapper; import com.ruoyi.database.service.ApprovalProcessService; +import com.ruoyi.database.service.BusinessTripApprovalService; +import com.ruoyi.database.service.NonWorkingDayDrinkingReportService; +import com.ruoyi.database.service.PoliceLeaveApprovalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -32,6 +39,9 @@ import java.util.List; public class ApprovalProcessController extends BaseController { private final ApprovalProcessService approvalsProcessService; + private final BusinessTripApprovalService businessTripApprovalService; + private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService; + private final PoliceLeaveApprovalService policeLeaveApprovalService; @PostMapping("/list") @@ -132,11 +142,31 @@ public class ApprovalProcessController extends BaseController { @ApiOperation("根据id查") @PostMapping("/getById/{id}") public AjaxResult getById(@PathVariable Long id) { - List list = approvalsProcessService.lambdaQuery() - .eq(ApprovalProcess::getId, id) - .orderByDesc(ApprovalProcess::getCreateTime) - .list(); - return AjaxResult.success(list); + ApprovalProcess byId = approvalsProcessService.getById(id); + Integer matterType = byId.getMatterType(); + if (matterType == 2){ + BusinessTripApproval one = businessTripApprovalService.lambdaQuery() + .eq(BusinessTripApproval::getUuid, byId.getUuid()) + .last("LIMIT 1") + .one(); + one.setDestinationIdCn(byId.getBusinessTripDestination()); + return AjaxResult.success(one); + } + if (matterType == 3){ + PoliceLeaveApproval one = policeLeaveApprovalService.lambdaQuery() + .eq(PoliceLeaveApproval::getUuid, byId.getUuid()) + .last("LIMIT 1") + .one(); + return AjaxResult.success(one); + } + if (matterType == 4){ + NonWorkingDayDrinkingReport one = nonWorkingDayDrinkingReportService.lambdaQuery() + .eq(NonWorkingDayDrinkingReport::getUuid, byId.getUuid()) + .last("LIMIT 1") + .one(); + return AjaxResult.success(one); + } + return AjaxResult.success(null); } diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java b/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java index 373edd2..fd687e4 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java @@ -37,6 +37,8 @@ public class BusinessTripApproval extends BaseEntityMini { @ApiModelProperty("出差目的地") private Integer destinationId; + @TableField(exist = false) + private String destinationIdCn; @ApiModelProperty("出差开始日期") private Long startDate; @@ -55,6 +57,8 @@ public class BusinessTripApproval extends BaseEntityMini { @ApiModelProperty("是否自带公务车辆") private Integer hasOffcialCar; + @TableField(exist = false) + private String hasOffcialCarCn; @ApiModelProperty("车型") private Integer carModel;