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

修改

This commit is contained in:
hanrenchun 2025-06-09 14:38:59 +08:00
parent 2fa0201732
commit 49287990a9
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ package com.ruoyi.business.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.controller.BaseController; 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.domain.entity.SysUser;
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.BusinessTripApproval;
@ -12,6 +13,7 @@ import com.ruoyi.database.service.ApprovalProcessService;
import com.ruoyi.database.service.BusinessTripApprovalService; import com.ruoyi.database.service.BusinessTripApprovalService;
import com.ruoyi.database.service.NonWorkingDayDrinkingReportService; import com.ruoyi.database.service.NonWorkingDayDrinkingReportService;
import com.ruoyi.database.service.PoliceLeaveApprovalService; import com.ruoyi.database.service.PoliceLeaveApprovalService;
import com.ruoyi.system.service.ISysUserService;
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;
@ -24,6 +26,8 @@ import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
@ -41,6 +45,7 @@ public class ApprovalProcessController extends BaseController {
private final BusinessTripApprovalService businessTripApprovalService; private final BusinessTripApprovalService businessTripApprovalService;
private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService; private final NonWorkingDayDrinkingReportService nonWorkingDayDrinkingReportService;
private final PoliceLeaveApprovalService policeLeaveApprovalService; private final PoliceLeaveApprovalService policeLeaveApprovalService;
private final ISysUserService sysUserService;
@PostMapping("/list") @PostMapping("/list")
@ -211,6 +216,25 @@ public class ApprovalProcessController extends BaseController {
.last("LIMIT 1") .last("LIMIT 1")
.one(); .one();
one.setDestinationIdCn(byId.getBusinessTripDestination()); one.setDestinationIdCn(byId.getBusinessTripDestination());
String togUserIds = one.getTogUserIds();
if (togUserIds != null && !"".equals(togUserIds)){
List<SysUser> userList = new ArrayList<>();
if (togUserIds.contains(",")){
String[] split = togUserIds.split(",");
for (String s : split) {
s = s.trim(); // 移除首尾空格
if (!s.isEmpty()) {
SysUser user = sysUserService.selectUserById(Long.parseLong(togUserIds));
userList.add(user);
}
}
one.setTogUserList(userList);
}else {
SysUser user = sysUserService.selectUserById(Long.parseLong(togUserIds));
userList.add(user);
one.setTogUserList(userList);
}
}
return AjaxResult.success(one); return AjaxResult.success(one);
} }
if (matterType == 3) { if (matterType == 3) {

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

@ -2,6 +2,7 @@ package com.ruoyi.database.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.BaseEntityMini; import com.ruoyi.common.core.domain.BaseEntityMini;
import com.ruoyi.common.core.domain.entity.SysUser;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -90,4 +91,8 @@ public class BusinessTripApproval extends BaseEntityMini {
private Integer isPressing; private Integer isPressing;
@TableField(exist = false) @TableField(exist = false)
private String isPressingCn; private String isPressingCn;
@TableField(exist = false)
private List<SysUser> togUserList;
} }