申请单增加唯一标识字段

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

@@ -30,6 +30,11 @@ public class Apply extends TenantEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 申请人id
      */

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

-package org.dromara.server.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serial;
-import java.util.Date;
-
-/**
- * 出差申请审批对象 biz_apply_approve
- *
- * @author hzh
- * @date 2024-12-04
- */
-@Data
-@TableName("biz_apply_approve")
-public class ApplyApprove {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @TableId(value = "id")
-    private Long id;
-
-    /**
-     * 申请单id
-     */
-    private Long applyId;
-
-    /**
-     * 审批人id
-     */
-    private Long approveUserId;
-
-    /**
-     * 审批人
-     */
-    private String approveName;
-
-    /**
-     * 审批时间
-     */
-    private Date approveTime;
-
-    /**
-     * 审批描述
-     */
-    private String approveDesc;
-
-    /**
-     * 是否通过
-     */
-    private Boolean pass;
-
-
-}

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

 package org.dromara.server.domain.bo;
 
-import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.server.domain.ApplyApprove;
 
 import java.util.Date;
 
@@ -16,18 +12,13 @@ import java.util.Date;
  * @date 2024-12-04
  */
 @Data
-@AutoMapper(target = ApplyApprove.class, reverseConvertGenerate = false)
 public class ApplyApproveBo {
 
-    /**
-     * id
-     */
-    private Long id;
 
     /**
      * 申请单id
      */
-    @NotNull(message = "申请单id不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "申请单id不能为空")
     private Long applyId;
 
     /**
@@ -53,7 +44,7 @@ public class ApplyApproveBo {
     /**
      * 是否通过
      */
-    @NotNull(message = "是否通过不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "是否通过不能为空")
     private Boolean pass;
 
 

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

@@ -33,6 +33,11 @@ public class ApplyBo extends BaseEntity {
     @NotNull(message = "id不能为空", groups = {EditGroup.class})
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 申请人id
      */

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/domain/vo/ApplyApproveVo.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.ApplyApprove;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * 出差申请审批视图对象 biz_apply_approve
- *
- * @author hzh
- * @date 2024-12-04
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = ApplyApprove.class)
-public class ApplyApproveVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * id
-     */
-    @ExcelProperty(value = "id")
-    private Long id;
-
-    /**
-     * 申请单id
-     */
-    @ExcelProperty(value = "申请单id")
-    private Long applyId;
-
-    /**
-     * 审批人id
-     */
-    @ExcelProperty(value = "审批人id")
-    private Long approveUserId;
-
-    /**
-     * 审批人
-     */
-    @ExcelProperty(value = "审批人")
-    private String approveName;
-
-    /**
-     * 审批时间
-     */
-    @ExcelProperty(value = "审批时间")
-    private Date approveTime;
-
-    /**
-     * 审批描述
-     */
-    @ExcelProperty(value = "审批描述")
-    private String approveDesc;
-
-    /**
-     * 是否通过
-     */
-    @ExcelProperty(value = "是否通过")
-    private Boolean pass;
-
-
-}

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

@@ -33,6 +33,11 @@ public class ApplyVo implements Serializable {
     @ExcelProperty(value = "id")
     private Long id;
 
+    /**
+     * 唯一标识
+     */
+    private String applyCode;
+
     /**
      * 申请人id
      */

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

 package org.dromara.server.domain.vo;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.List;
  **/
 @Data
 @Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
 public class TravelControlMethodVo extends TravelVo {
 
     /**

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

 package org.dromara.server.domain.vo;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
@@ -9,6 +10,7 @@ import lombok.experimental.Accessors;
  **/
 @Data
 @Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
 public class TravelTripLimitVo extends TravelVo {
 
     /**

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

-package org.dromara.server.mapper;
-
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-import org.dromara.server.domain.ApplyApprove;
-import org.dromara.server.domain.vo.ApplyApproveVo;
-
-/**
- * 出差申请审批Mapper接口
- *
- * @author hzh
- * @date 2024-12-04
- */
-public interface ApplyApproveMapper extends BaseMapperPlus<ApplyApprove, ApplyApproveVo> {
-
-}

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

@@ -25,7 +25,6 @@ import org.dromara.server.domain.bo.ProcessApproveBo;
 import org.dromara.server.domain.vo.ApplyPersonVo;
 import org.dromara.server.domain.vo.ApplyVo;
 import org.dromara.server.domain.vo.ProcessApproveVo;
-import org.dromara.server.mapper.ApplyApproveMapper;
 import org.dromara.server.mapper.ApplyMapper;
 import org.dromara.server.mapper.ApplyPersonMapper;
 import org.dromara.server.service.IApplyService;
@@ -33,10 +32,7 @@ import org.dromara.server.service.IProcessProgressService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 出差申请Service业务层处理
@@ -50,7 +46,6 @@ public class ApplyServiceImpl extends AbstractBaseService<ApplyVo, ApplyBo, Appl
 
     private final ApplyMapper baseMapper;
     private final ApplyPersonMapper applyPersonMapper;
-    private final ApplyApproveMapper applyApproveMapper;
     private final IProcessProgressService processProgressService;
 
     @Override
@@ -83,6 +78,7 @@ public class ApplyServiceImpl extends AbstractBaseService<ApplyVo, ApplyBo, Appl
         bo.setApplyTime(new Date());
         bo.setApplyDeptName(LoginHelper.getDeptName());
         bo.setStatus(ApplyStatus.WAIT_AUDIT.getCode());
+        bo.setApplyCode(UUID.randomUUID().toString().replaceAll("-", ""));
         Apply apply = MapstructUtils.convert(bo, Apply.class);
         Boolean result = baseMapper.insert(apply) == 1;
         if (result) {

ruoyi-modules/ruoyi-server/src/main/resources/mapper/server/ApplyApproveMapper.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.ApplyApproveMapper">
-
-</mapper>