From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java b/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
index f58c4ed..0b4bb9c 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/RolesServiceImpl.java
@@ -1,24 +1,44 @@
package com.ruoyi.projectManagement.service.impl;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.enums.IsDeleteEnum;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
+import com.ruoyi.projectManagement.vo.SimpleRoleVo;
+import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
+@AllArgsConstructor
@Service
-@RequiredArgsConstructor
-@Transactional(rollbackFor = Exception.class)
public class RolesServiceImpl extends ServiceImpl<RolesMapper, Roles> implements RolesService {
private final RolesMapper rolesmapper;
@Override
public IPage<Roles> listPage(Page<Roles> page, Roles roles) {
- return rolesmapper.selectPage(page, null);
+ LambdaQueryWrapper<Roles> queryWrapper = new LambdaQueryWrapper<>();
+ if (roles.getName() != null) {
+ queryWrapper.like(Roles::getName, roles.getName());
+ }
+ if (roles.getStatus() != null) {
+ queryWrapper.eq(Roles::getStatus, roles.getStatus());
+ }
+ return rolesmapper.selectPage(page, queryWrapper);
+ }
+
+ @Override
+ public List<SimpleRoleVo> listSimpleRole() {
+ LambdaQueryWrapper<Roles> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Roles::getStatus, 1);
+ return BeanUtil.copyToList(rolesmapper.selectList(queryWrapper), SimpleRoleVo.class);
}
}
--
Gitblit v1.9.3