From a5d406d38dd39a1078a208e3055d71e58c6444f3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 10 二月 2026 10:03:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
index e1faffb..f6eee0f 100644
--- a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
+++ b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
@@ -40,11 +40,14 @@
@Autowired
private CompensationPerformanceService compensationPerformanceService;
+ @Autowired
+ private StaffOnJobMapper staffOnJobMapper;
+
@GetMapping("/listPage")
@Log(title = "钖叕缁╂晥-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("钖叕缁╂晥-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, CompensationPerformance compensationPerformance){
- IPage<CompensationPerformance> listPage = compensationPerformanceService.listPage(page, compensationPerformance);
+ public AjaxResult listPage(Page page, String staffName, String payDateStr) {
+ IPage<CompensationPerformance> listPage = compensationPerformanceService.listPage(page, staffName, payDateStr);
return AjaxResult.success(listPage);
}
@@ -52,7 +55,7 @@
@Log(title = "钖叕缁╂晥-娣诲姞", businessType = BusinessType.INSERT)
@ApiOperation("钖叕缁╂晥-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CompensationPerformance compensationPerformance){
+ public AjaxResult add(@RequestBody CompensationPerformance compensationPerformance) {
boolean save = compensationPerformanceService.save(compensationPerformance);
return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
}
@@ -61,7 +64,7 @@
@Log(title = "钖叕缁╂晥-淇敼", businessType = BusinessType.UPDATE)
@ApiOperation("钖叕缁╂晥-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody CompensationPerformance compensationPerformance){
+ public AjaxResult update(@RequestBody CompensationPerformance compensationPerformance) {
boolean update = compensationPerformanceService.updateById(compensationPerformance);
return update ? AjaxResult.success("淇敼鎴愬姛") : AjaxResult.error("淇敼澶辫触");
}
@@ -70,17 +73,17 @@
@Log(title = "钖叕缁╂晥-鍒犻櫎", businessType = BusinessType.DELETE)
@ApiOperation("钖叕缁╂晥-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
boolean delete = compensationPerformanceService.removeBatchByIds(ids);
return delete ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
}
@Log(title = "瀵煎嚭钖祫绠＄悊鍒楄〃", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response ) {
- List<CompensationPerformance> list = compensationPerformanceService.list();
- ExcelUtil<CompensationPerformance> util = new ExcelUtil<CompensationPerformance>(CompensationPerformance.class);
+ public void export(HttpServletResponse response) {
+ List<CompensationPerformance> list = compensationPerformanceService.exportList();
+ ExcelUtil<CompensationPerformance> util = new ExcelUtil<>(CompensationPerformance.class);
util.exportExcel(response, list, "瀵煎嚭钖祫绠＄悊鍒楄〃");
}
@@ -92,18 +95,15 @@
util.exportExcel(response, list, "涓嬭浇钖祫绠＄悊鍒楄〃妯℃澘");
}
- @Autowired
- private SysUserMapper sysUserMapper;
-
@Log(title = "瀵煎叆钖祫绠＄悊鍒楄〃", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<CompensationPerformance> util = new ExcelUtil<>(CompensationPerformance.class);
List<CompensationPerformance> list = util.importExcel(file.getInputStream());
- list.forEach(item->{
- SysUser staffOnJob = sysUserMapper.selectUserByNickName(item.getName());
- if(staffOnJob!=null){
- item.setStaffId(staffOnJob.getUserId());
+ list.forEach(item -> {
+ StaffOnJob staffOnJob = staffOnJobMapper.selectStaffByNickName(item.getStaffName());
+ if (staffOnJob != null) {
+ item.setStaffId(staffOnJob.getId());
}
});
boolean b = compensationPerformanceService.saveBatch(list);
--
Gitblit v1.9.3