From 3e464f97ed576eced411835e18364488ac725ac9 Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Mon, 9 Jun 2025 10:00:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/BusinessTripApprovalController.java | 6 ++++-- .../com/ruoyi/business/controller/DetailsApiController.java | 4 ++++ .../business/controller/PoliceLeaveApprovalController.java | 1 + .../java/com/ruoyi/database/domain/ApprovalProcess.java | 5 +++++ .../com/ruoyi/database/domain/BusinessTripApproval.java | 2 -- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java index 883371d..be874c8 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java @@ -102,6 +102,7 @@ public class BusinessTripApprovalController extends BaseController { String uuids = uuid.toString(); dto.setUuid(uuids); + BaseAddressInfo byId = baseAddressInfoService.getById(dto.getDestinationId()); ApprovalProcess approvalProcess = new ApprovalProcess(); approvalProcess.setApprovalNo(s); approvalProcess.setProcessTitle("出差呈请"); @@ -111,8 +112,9 @@ public class BusinessTripApprovalController extends BaseController { approvalProcess.setMatterType(2); approvalProcess.setApprovalStatus(0); approvalProcess.setReadStatus(0); - approvalProcess.setBusinessTripDestination(dto.getDestinationIdCn()); - approvalProcess.setStartTime(approvalProcess.getStartTime()); + approvalProcess.setBusinessTripDestination(byId.getAddName()); + approvalProcess.setStartTime(dto.getStartDate()); + approvalProcess.setEndTime(dto.getEndDate()); approvalProcess.setCreateTime(new Date().getTime()); approvalProcess.setUuid(uuids); approvalsProcessService.save(approvalProcess); diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/DetailsApiController.java b/gather-app/src/main/java/com/ruoyi/business/controller/DetailsApiController.java index 42280c2..f1a54c6 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/DetailsApiController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/DetailsApiController.java @@ -23,4 +23,8 @@ public class DetailsApiController extends BaseController { private final BusinessTripApprovalService businessTripApprovalService; + public void getUserPic(){ + + } + } diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java index 963c199..6c28c6d 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/PoliceLeaveApprovalController.java @@ -132,6 +132,7 @@ public class PoliceLeaveApprovalController extends BaseController { approvalProcess.setMatterType(3); approvalProcess.setApprovalStatus(0); approvalProcess.setReadStatus(0); + approvalProcess.setLeaveType(policeLeaveApproval.getLeaveType()); approvalProcess.setStartTime(policeLeaveApproval.getStartDate()); approvalProcess.setEndTime(policeLeaveApproval.getEndDate()); approvalProcess.setCreateTime(new Date().getTime()); diff --git a/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java b/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java index 09899af..a0be05a 100644 --- a/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java +++ b/gather-app/src/main/java/com/ruoyi/database/domain/ApprovalProcess.java @@ -122,4 +122,9 @@ public class ApprovalProcess { @ApiModelProperty("关联用uuid") private String uuid; + @ApiModelProperty("请假类别（1-公休假 2-事假 3-探亲假 4-婚假 5-产假 6-护理假 7-病假 8-育儿假 9-其他）") + private Integer leaveType; + @TableField(exist = false) + private String leaveTypeCn; + } 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 7645d34..373edd2 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,8 +37,6 @@ public class BusinessTripApproval extends BaseEntityMini { @ApiModelProperty("出差目的地") private Integer destinationId; - @TableField(exist = false) - private String destinationIdCn; @ApiModelProperty("出差开始日期") private Long startDate; From ec0b7aedc251070f597a95b9dda9b6d51a4c294f Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Mon, 9 Jun 2025 10:42:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/business/controller/gwglLogController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java b/gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java index 932f0c9..2363ace 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/gwglLogController.java @@ -8,10 +8,7 @@ import com.ruoyi.database.service.gwglLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -30,7 +27,7 @@ public class gwglLogController extends BaseController { private final gwglLogService gwglLogService; @ApiOperation("查询审批日志") - @RequestMapping("/list") + @PostMapping("/list") public TableDataInfo query(@RequestBody gwglLog gwglLog){ startPage(); QueryWrapper queryWrapper = new QueryWrapper<>(gwglLog); @@ -39,7 +36,7 @@ public class gwglLogController extends BaseController { } @ApiOperation("根据编号查询日志") - @RequestMapping("/detail/{applyNo}") + @GetMapping("/detail/{applyNo}") public TableDataInfo detail(@PathVariable String applyNo){ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("apply_no", applyNo); From d88a13561e280b9cd90350b1a638a288115a907e Mon Sep 17 00:00:00 2001 From: hanrenchun Date: Mon, 9 Jun 2025 11:10:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApprovalProcessController.java | 40 ++++++++++++++++--- .../database/domain/BusinessTripApproval.java | 4 ++ 2 files changed, 39 insertions(+), 5 deletions(-) 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;