From 33f9eae4ad4321860e4881f5f38dad6368c878ef Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 16:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
index d57a25e..793f94f 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.bean.dto.UserAccountDto;
import com.ruoyi.production.bean.dto.UserProductionAccountingDto;
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
@@ -52,17 +52,18 @@
@Override
- public R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
LambdaQueryWrapper<SchemeApplicableStaff> schemeApplicableStaffLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(schemeApplicableStaff != null){
if(StringUtils.isNotEmpty(schemeApplicableStaff.getTitle())){
schemeApplicableStaffLambdaQueryWrapper.like(SchemeApplicableStaff::getTitle, schemeApplicableStaff.getTitle());
}
}
+ schemeApplicableStaffLambdaQueryWrapper.orderByDesc(SchemeApplicableStaff::getId);
Page<SchemeApplicableStaff> page1 = schemeApplicableStaffMapper.selectPage(page, schemeApplicableStaffLambdaQueryWrapper);
List<Long> collect = page1.getRecords().stream().map(SchemeApplicableStaff::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(collect)){
- return R.ok(page1);
+ return AjaxResult.success(page1);
}
List<SchemeInsuranceDetail> schemeInsuranceDetails = schemeInsuranceDetailMapper
.selectList(new LambdaQueryWrapper<SchemeInsuranceDetail>()
@@ -82,7 +83,7 @@
item.setDeptNames(sysDepts.stream().map(SysDept::getDeptName).collect(Collectors.joining(",")));
}
});
- return R.ok(page1);
+ return AjaxResult.success(page1);
}
public void setSchemeApplicableStaffUserInfo(SchemeApplicableStaff schemeApplicableStaff) {
@@ -103,12 +104,12 @@
}
@Override
- public R<?> add(SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult add(SchemeApplicableStaff schemeApplicableStaff) {
if(schemeApplicableStaff == null){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
if(CollectionUtils.isEmpty(schemeApplicableStaff.getSchemeInsuranceDetailList())){
- return R.fail("璇烽�夋嫨鏂规鏄庣粏");
+ return AjaxResult.error("璇烽�夋嫨鏂规鏄庣粏");
}
setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //鏍规嵁閮ㄩ棬璁剧疆鐢ㄦ埛淇℃伅
int insert = schemeApplicableStaffMapper.insert(schemeApplicableStaff);
@@ -116,13 +117,13 @@
item.setSchemeId(schemeApplicableStaff.getId());
schemeInsuranceDetailMapper.insert(item);
});
- return R.ok(insert);
+ return AjaxResult.success(insert);
}
@Override
- public R<?> updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff) {
+ public AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff) {
if(schemeApplicableStaff == null){
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //鏍规嵁閮ㄩ棬璁剧疆鐢ㄦ埛淇℃伅
int update = schemeApplicableStaffMapper.updateById(schemeApplicableStaff);
@@ -133,18 +134,18 @@
item.setSchemeId(schemeApplicableStaff.getId());
schemeInsuranceDetailMapper.insert(item);
});
- return R.ok(update);
+ return AjaxResult.success(update);
}
@Override
- public R<?> delete(List<Long> ids) {
+ public AjaxResult delete(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return R.fail("鍙傛暟閿欒");
+ return AjaxResult.error("鍙傛暟閿欒");
}
int delete = schemeApplicableStaffMapper.deleteBatchIds(ids);
schemeInsuranceDetailMapper.delete(new LambdaQueryWrapper<SchemeInsuranceDetail>()
.in(SchemeInsuranceDetail::getSchemeId, ids));
- return R.ok(delete);
+ return AjaxResult.success(delete);
}
/**
--
Gitblit v1.9.3