| 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
@@ -149,6 +149,11 @@ * 设备报修id */ private Long deviceRepairId; /** * 报销金额 */ private BigDecimal price; /** * 报修金额 */ src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java
@@ -84,6 +84,7 @@ approveProcess.setApproveUserName(sysUser.getNickName()); approveProcess.setApproveDeptId(approveProcessVO.getApproveDeptId()); approveProcess.setApproveDeptName(sysDept.getDeptName()); approveProcess.setPrice(approveProcessVO.getPrice()); approveProcess.setApproveUserNames(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(","))); approveProcess.setApproveTime(StringUtils.isEmpty(approveProcessVO.getApproveTime()) ? null : dateFormat.parse(approveProcessVO.getApproveTime())); approveProcess.setApproveReason(approveProcessVO.getApproveReason()); @@ -190,6 +191,7 @@ approve.setApproveUserCurrentId(Long.parseLong(split[0])); approve.setApproveUserCurrentName(sysUsers.stream().filter(user -> user.getUserId().equals(Long.parseLong(split[0]))).collect(Collectors.toList()).get(0).getNickName()); } approve.setPrice(approveGetAndUpdateVo.getPrice()); updateById(approve); //修改审批人 // 先删除 后新增 src/main/java/com/ruoyi/approve/vo/ApproveGetAndUpdateVo.java
@@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import java.math.BigDecimal; import java.util.List; @Data @@ -28,4 +29,6 @@ * 审批类型 */ private Integer approveType; private BigDecimal price; } src/main/java/com/ruoyi/approve/vo/ApproveProcessVO.java
@@ -56,4 +56,9 @@ * 报修金额 */ private BigDecimal maintenancePrice; /** * 报销金额 */ private BigDecimal price; }