From aa4cfff149b008d5492f2360b3ab1162554d2aa2 Mon Sep 17 00:00:00 2001
From: mobh <mobh@youlingrc.com>
Date: Wed, 28 Oct 2020 15:08:03 +0800
Subject: [PATCH] 薪资档案分页
---
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java | 14 ++++++++++----
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java | 11 +++++------
src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml | 10 +++++-----
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
index 1d248b0..6f7333c 100644
--- a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+++ b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
@@ -15,6 +15,7 @@ import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.script.ScriptException;
+import cn.timer.api.bean.sbgjj.SbgjjAssoCbfa;
import cn.timer.api.dto.xcgl.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -825,8 +826,8 @@ public class SalaryManagementController {
* 查询定薪人员+模糊查询*******
*/
@PostMapping(value = "/fixedstaff")
- @ApiOperation(value = "查询定薪人员", httpMethod = "POST", notes = "接口发布说明")
- public ResponseResult FixedSalarStaff(@CurrentUser UserBean userBean,@RequestBody SearchSalariedPeopleDto search) {
+ @ApiOperation(value = "查询定薪人员/分页", httpMethod = "POST", notes = "接口发布说明")
+ public Result<Object> FixedSalarStaff(@CurrentUser UserBean userBean,@RequestBody SearchSalariedPeopleDto search) {
search.setOrgcode(userBean.getOrgCode());
if(("0").equals(search.getStatus())) {//全部
search.setStatus("");
@@ -835,8 +836,13 @@ public class SalaryManagementController {
}else {
search.setStatus("3");
}
- List<FixedSalaryStaffDto> dxrylist = xcglassoxzdazdymapper.selectFixedSalaryStaff(search);//
- return new ResponseResult().success("获取自定义薪资组表头信息", dxrylist);
+
+ Page<FixedSalaryStaffDto> page = new Page<FixedSalaryStaffDto>(
+ search.getCurrentPage() == null ? 1 : search.getCurrentPage(),
+ search.getTotalPage() == null ? 10 : search.getTotalPage());
+
+ IPage<FixedSalaryStaffDto> dxrypage = xcglassoxzdazdymapper.selectFixedSalaryStaff(page, search);//
+ return ResultUtil.data(dxrypage, dxrypage.getRecords(), "获取自定义薪资组表头信息");
}
/**
diff --git a/src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java b/src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java
index c7a5fff..604524a 100644
--- a/src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java
+++ b/src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzdazdyMapper.java
@@ -1,15 +1,14 @@
package cn.timer.api.dao.xcgl;
import java.util.List;
+import cn.timer.api.dto.xcgl.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.xcgl.XcglAssoXzdazdy;
-import cn.timer.api.dto.xcgl.ChangeSalaryDto;
-import cn.timer.api.dto.xcgl.CheckSalaryStaffDto;
-import cn.timer.api.dto.xcgl.FixedSalaryStaffDto;
-import cn.timer.api.dto.xcgl.SearchSalariedPeopleDto;
/**
@@ -25,8 +24,8 @@ public interface XcglAssoXzdazdyMapper extends BaseMapper<XcglAssoXzdazdy> {
int insertxcglassoxzdazdyList(List<XcglAssoXzdazdy> xcglassoxzdazdy);
int dazdyupdate(XcglAssoXzdazdy xcglassoxzdazdy);
-
- List<FixedSalaryStaffDto> selectFixedSalaryStaff(SearchSalariedPeopleDto search);
+
+ IPage<FixedSalaryStaffDto> selectFixedSalaryStaff(IPage<FixedSalaryStaffDto> page, @Param("param")SearchSalariedPeopleDto search);
List<ChangeSalaryDto> AchieveSalaryAdjustment(Integer orgcode,Integer empnum);
diff --git a/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml b/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
index c5ba8c6..c85f8ce 100644
--- a/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
+++ b/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
@@ -197,12 +197,12 @@
from yggl_main_emp emp
LEFT JOIN xcgl_asso_xzdadx as dadx on dadx.userid = emp.emp_num and dadx.txzt = 0
LEFT JOIN xcgl_asso_xzdaz as xzdaz on xzdaz.xzdadxid = dadx.id
- where emp.org_code = #{orgcode}
- <if test="status != ''" >
- and emp.job_status = #{status}
+ where emp.org_code = #{param.orgcode}
+ <if test="param.status != ''" >
+ and emp.job_status = #{param.status}
</if>
- <if test="text != ''" >
- and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
+ <if test="param.text != ''" >
+ and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
</if>
</select>
--
libgit2 0.26.0