设置默认配置

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/constant/travel/PayMethod.java

+package org.dromara.server.constant.travel;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author wenhe
+ */
+@Getter
+@AllArgsConstructor
+public enum PayMethod {
+
+    //企业
+    ENTERPRISE,
+    //个人
+    PERSONAL;
+
+    /**
+     * 获取默认值
+     * @return 默认值
+     */
+    public static PayMethod getDefault() {
+        return ENTERPRISE;
+    }
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/TravelConfigPersonController.java

+package org.dromara.server.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.server.domain.bo.TravelConfigPersonBo;
+import org.dromara.server.domain.vo.TravelConfigPersonVo;
+import org.dromara.server.service.ITravelConfigPersonService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 员工差旅设置
+ * 前端访问路由地址为:/server/configPerson
+ *
+ * @author hzh
+ * @date 2024-12-23
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/configPerson")
+public class TravelConfigPersonController extends BaseController {
+
+    private final ITravelConfigPersonService travelConfigPersonService;
+
+    /**
+     * 查询员工差旅设置列表
+     */
+    @SaCheckPermission("server:configPerson:list")
+    @GetMapping("/list")
+    public TableDataInfo<TravelConfigPersonVo> list(TravelConfigPersonBo bo, PageQuery pageQuery) {
+        return travelConfigPersonService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出员工差旅设置列表
+     */
+    @SaCheckPermission("server:configPerson:export")
+    @Log(title = "员工差旅设置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TravelConfigPersonBo bo, HttpServletResponse response) {
+        List<TravelConfigPersonVo> list = travelConfigPersonService.queryList(bo);
+        ExcelUtil.exportExcel(list, "员工差旅设置", TravelConfigPersonVo.class, response);
+    }
+
+    /**
+     * 获取员工差旅设置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("server:configPerson:query")
+    @GetMapping("/{id}")
+    public R<TravelConfigPersonVo> getInfo(@NotNull(message = "主键不能为空")
+                                           @PathVariable Long id) {
+        return R.ok(travelConfigPersonService.queryById(id));
+    }
+
+    /**
+     * 新增员工差旅设置
+     */
+    @SaCheckPermission("server:configPerson:add")
+    @Log(title = "员工差旅设置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody TravelConfigPersonBo bo) {
+        return toAjax(travelConfigPersonService.insertByBo(bo));
+    }
+
+    /**
+     * 修改员工差旅设置
+     */
+    @SaCheckPermission("server:configPerson:edit")
+    @Log(title = "员工差旅设置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TravelConfigPersonBo bo) {
+        return toAjax(travelConfigPersonService.updateByBo(bo));
+    }
+
+    /**
+     * 删除员工差旅设置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("server:configPerson:remove")
+    @Log(title = "员工差旅设置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(travelConfigPersonService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/TravelConfig.java

@@ -66,6 +66,11 @@ public class TravelConfig extends TenantEntity {
      */
     private String travelControl;
 
+    /**
+     * 支付方式
+     */
+    private String payMethod;
+
     /**
      * 删除标志（0代表存在 2代表删除）
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/TravelConfigPerson.java

+package org.dromara.server.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 员工差旅设置对象 travel_config_person
+ *
+ * @author hzh
+ * @date 2024-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("travel_config_person")
+public class TravelConfigPerson extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 管控方式
+     */
+    private String controlMethod;
+
+    /**
+     * 出差时间限制
+     */
+    private String timeLimit;
+
+    /**
+     * 行程限制
+     */
+    private String tripLimit;
+
+    /**
+     * 审批开关
+     */
+    private Boolean approveSwitch;
+
+    /**
+     * 申请开关
+     */
+    private Boolean applySwitch;
+
+    /**
+     * 预算控制
+     */
+    private String budgetControl;
+
+    /**
+     * 差旅控制
+     */
+    private String travelControl;
+
+    /**
+     * 支付方式
+     */
+    private String payMethod;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/TravelConfigBo.java

@@ -68,5 +68,9 @@ public class TravelConfigBo extends BaseEntity {
     @NotBlank(message = "差旅控制不能为空", groups = { AddGroup.class, EditGroup.class })
     private String travelControl;
 
+    /**
+     * 支付方式
+     */
+    private String payMethod;
 
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/bo/TravelConfigPersonBo.java

+package org.dromara.server.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.server.domain.TravelConfigPerson;
+
+/**
+ * 员工差旅设置业务对象 travel_config_person
+ *
+ * @author hzh
+ * @date 2024-12-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TravelConfigPerson.class, reverseConvertGenerate = false)
+public class TravelConfigPersonBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 管控方式
+     */
+    @NotBlank(message = "管控方式不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String controlMethod;
+
+    /**
+     * 出差时间限制
+     */
+    @NotBlank(message = "出差时间限制不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String timeLimit;
+
+    /**
+     * 行程限制
+     */
+    @NotBlank(message = "行程限制不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String tripLimit;
+
+    /**
+     * 审批开关
+     */
+    @NotNull(message = "审批开关不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Boolean approveSwitch;
+
+    /**
+     * 申请开关
+     */
+    @NotNull(message = "申请开关不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Boolean applySwitch;
+
+    /**
+     * 预算控制
+     */
+    @NotBlank(message = "预算控制不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String budgetControl;
+
+    /**
+     * 差旅控制
+     */
+    @NotBlank(message = "差旅控制不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String travelControl;
+
+    /**
+     * 支付方式
+     */
+    @NotBlank(message = "支付方式不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String payMethod;
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/TravelConfigPersonVo.java

+package org.dromara.server.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.server.domain.TravelConfigPerson;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 员工差旅设置视图对象 travel_config_person
+ *
+ * @author hzh
+ * @date 2024-12-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TravelConfigPerson.class)
+public class TravelConfigPersonVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @ExcelProperty(value = "用户id")
+    private Long userId;
+
+    /**
+     * 管控方式
+     */
+    @ExcelProperty(value = "管控方式")
+    private String controlMethod;
+
+    /**
+     * 出差时间限制
+     */
+    @ExcelProperty(value = "出差时间限制")
+    private String timeLimit;
+
+    /**
+     * 行程限制
+     */
+    @ExcelProperty(value = "行程限制")
+    private String tripLimit;
+
+    /**
+     * 审批开关
+     */
+    @ExcelProperty(value = "审批开关")
+    private Boolean approveSwitch;
+
+    /**
+     * 申请开关
+     */
+    @ExcelProperty(value = "申请开关")
+    private Boolean applySwitch;
+
+    /**
+     * 预算控制
+     */
+    @ExcelProperty(value = "预算控制")
+    private String budgetControl;
+
+    /**
+     * 差旅控制
+     */
+    @ExcelProperty(value = "差旅控制")
+    private String travelControl;
+
+    /**
+     * 支付方式
+     */
+    @ExcelProperty(value = "支付方式")
+    private String payMethod;
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/TravelConfigVo.java

 package org.dromara.server.domain.vo;
 
-import org.dromara.server.domain.TravelConfig;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.server.domain.TravelConfig;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
 
 
 
@@ -76,5 +73,10 @@ public class TravelConfigVo implements Serializable {
     @ExcelProperty(value = "差旅控制")
     private String travelControl;
 
+    /**
+     * 支付方式
+     */
+    @ExcelProperty(value = "支付方式")
+    private String payMethod;
 
 }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/mapper/TravelConfigPersonMapper.java

+package org.dromara.server.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.server.domain.TravelConfigPerson;
+import org.dromara.server.domain.vo.TravelConfigPersonVo;
+
+/**
+ * 员工差旅设置Mapper接口
+ *
+ * @author hzh
+ * @date 2024-12-23
+ */
+public interface TravelConfigPersonMapper extends BaseMapperPlus<TravelConfigPerson, TravelConfigPersonVo> {
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/ITravelConfigPersonService.java

+package org.dromara.server.service;
+
+import org.dromara.common.mybatis.service.IBaseService;
+import org.dromara.server.domain.TravelConfigPerson;
+import org.dromara.server.domain.bo.TravelConfigPersonBo;
+import org.dromara.server.domain.vo.TravelConfigPersonVo;
+
+/**
+ * 员工差旅设置Service接口
+ *
+ * @author hzh
+ * @date 2024-12-23
+ */
+public interface ITravelConfigPersonService extends IBaseService<TravelConfigPersonVo, TravelConfigPersonBo, TravelConfigPerson> {
+
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/TravelConfigPersonServiceImpl.java

+package org.dromara.server.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.common.mybatis.service.AbstractBaseService;
+import org.dromara.server.domain.TravelConfigPerson;
+import org.dromara.server.domain.bo.TravelConfigPersonBo;
+import org.dromara.server.domain.vo.TravelConfigPersonVo;
+import org.dromara.server.mapper.TravelConfigPersonMapper;
+import org.dromara.server.service.ITravelConfigPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 员工差旅设置Service业务层处理
+ *
+ * @author hzh
+ * @date 2024-12-23
+ */
+@RequiredArgsConstructor
+@Service
+public class TravelConfigPersonServiceImpl extends AbstractBaseService<TravelConfigPersonVo, TravelConfigPersonBo, TravelConfigPerson> implements ITravelConfigPersonService {
+
+    private final TravelConfigPersonMapper baseMapper;
+
+    @Override
+    public BaseMapperPlus<TravelConfigPerson, TravelConfigPersonVo> mapper() {
+        return baseMapper;
+    }
+
+    @Override
+    public LambdaQueryWrapper<TravelConfigPerson> buildQueryWrapper(TravelConfigPersonBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<TravelConfigPerson> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, TravelConfigPerson::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getControlMethod()), TravelConfigPerson::getControlMethod, bo.getControlMethod());
+        lqw.eq(StringUtils.isNotBlank(bo.getTimeLimit()), TravelConfigPerson::getTimeLimit, bo.getTimeLimit());
+        lqw.eq(StringUtils.isNotBlank(bo.getTripLimit()), TravelConfigPerson::getTripLimit, bo.getTripLimit());
+        lqw.eq(bo.getApproveSwitch() != null, TravelConfigPerson::getApproveSwitch, bo.getApproveSwitch());
+        lqw.eq(bo.getApplySwitch() != null, TravelConfigPerson::getApplySwitch, bo.getApplySwitch());
+        lqw.eq(StringUtils.isNotBlank(bo.getBudgetControl()), TravelConfigPerson::getBudgetControl, bo.getBudgetControl());
+        lqw.eq(StringUtils.isNotBlank(bo.getTravelControl()), TravelConfigPerson::getTravelControl, bo.getTravelControl());
+        lqw.eq(StringUtils.isNotBlank(bo.getPayMethod()), TravelConfigPerson::getPayMethod, bo.getPayMethod());
+        return lqw;
+    }
+
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/service/impl/TravelConfigServiceImpl.java

@@ -71,6 +71,7 @@ public class TravelConfigServiceImpl extends AbstractBaseService<TravelConfigVo,
                 .setApproveSwitch(ApproveSwitch.FALSE.getCode())
                 .setApplySwitch(ApplySwitch.FALSE.getCode())
                 .setBudgetControl(BudgetControl.NOT_CONTROL.getCode())
+                .setPayMethod(PayMethod.getDefault().name())
                 .setTravelControl(TravelControl.NOT_CONTROL.getCode());
             tc.setTenantId(tenantId);
             baseMapper.insert(tc);

ruoyi-modules/ruoyi-server/src/main/resources/mapper/server/TravelConfigPersonMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.server.mapper.TravelConfigPersonMapper">
+
+</mapper>