lijingtong
/
PublicAffairs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
hanrenchun 2025-06-09 11:10:23 +08:00
parent ec0b7aedc2
commit d88a13561e
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gather-app/src/main/java/com/ruoyi/business/controller/ApprovalProcessController.java
View File

@ -5,7 +5,14 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.database.domain.ApprovalProcess; 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.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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -32,6 +39,9 @@ import java.util.List;
public class ApprovalProcessController extends BaseController { public class ApprovalProcessController extends BaseController {
private final ApprovalProcessService approvalsProcessService; private final ApprovalProcessService approvalsProcessService;
private final BusinessTripApprovalService businessTripApprovalService;
private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService;
private final PoliceLeaveApprovalService policeLeaveApprovalService;
@PostMapping("/list") @PostMapping("/list")
@ -132,11 +142,31 @@ public class ApprovalProcessController extends BaseController {
@ApiOperation("根据id查") @ApiOperation("根据id查")
@PostMapping("/getById/{id}") @PostMapping("/getById/{id}")
public AjaxResult getById(@PathVariable Long id) { public AjaxResult getById(@PathVariable Long id) {
List<ApprovalProcess> list = approvalsProcessService.lambdaQuery() ApprovalProcess byId = approvalsProcessService.getById(id);
.eq(ApprovalProcess::getId, id) Integer matterType = byId.getMatterType();
.orderByDesc(ApprovalProcess::getCreateTime) if (matterType == 2){
.list(); BusinessTripApproval one = businessTripApprovalService.lambdaQuery()
return AjaxResult.success(list); .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);
} }

4
gather-app/src/main/java/com/ruoyi/database/domain/BusinessTripApproval.java
View File

@ -37,6 +37,8 @@ public class BusinessTripApproval extends BaseEntityMini {
@ApiModelProperty("出差目的地") @ApiModelProperty("出差目的地")
private Integer destinationId; private Integer destinationId;
@TableField(exist = false)
private String destinationIdCn;
@ApiModelProperty("出差开始日期") @ApiModelProperty("出差开始日期")
private Long startDate; private Long startDate;
@ -55,6 +57,8 @@ public class BusinessTripApproval extends BaseEntityMini {
@ApiModelProperty("是否自带公务车辆") @ApiModelProperty("是否自带公务车辆")
private Integer hasOffcialCar; private Integer hasOffcialCar;
@TableField(exist = false)
private String hasOffcialCarCn;
@ApiModelProperty("车型") @ApiModelProperty("车型")
private Integer carModel; private Integer carModel;