| src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -1,6 +1,7 @@ package com.ruoyi.approve.pojo; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; import java.util.List; @@ -84,6 +85,13 @@ private Long approveUserCurrentId; /** * 报销金额 */ @ApiModelProperty(value = "报销金额") @Excel(name = "报销金额") private BigDecimal price; /** * 当前审批用户名称 */ @ApiModelProperty(value = "当前审批人") src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -80,6 +80,7 @@ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); ApproveProcess approveProcess = new ApproveProcess(); approveProcess.setApproveId(approveID); approveProcess.setPrice(approveProcessVO.getPrice()); approveProcess.setApproveUser(approveProcessVO.getApproveUser()); approveProcess.setApproveUserName(sysUser.getNickName()); approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId()); src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -1,15 +1,23 @@ package com.ruoyi.approve.vo; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.sales.pojo.CommonFile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.List; @Data public class ApproveGetAndUpdateVo { private List<String> tempFileIds; /** * 报销金额 */ private BigDecimal price; //审批id @NotBlank(message = "流程编号不能为空") private String id; src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -1,9 +1,12 @@ package com.ruoyi.approve.vo; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.sales.pojo.CommonFile; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.List; @Data @@ -12,6 +15,7 @@ private List<String> tempFileIds; private Long id; private Long approveDeptId; @@ -27,6 +31,11 @@ private String approveReason; /** * 报销金额 */ private BigDecimal price; /** * 审批类型 */ private Integer approveType;