Commit aa4cfff1 by mobh Committed by chenzg

薪资档案分页

parent 5358e61b
...@@ -15,6 +15,7 @@ import javax.script.ScriptEngine; ...@@ -15,6 +15,7 @@ import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager; import javax.script.ScriptEngineManager;
import javax.script.ScriptException; import javax.script.ScriptException;
import cn.timer.api.bean.sbgjj.SbgjjAssoCbfa;
import cn.timer.api.dto.xcgl.*; import cn.timer.api.dto.xcgl.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -825,8 +826,8 @@ public class SalaryManagementController { ...@@ -825,8 +826,8 @@ public class SalaryManagementController {
* 查询定薪人员+模糊查询******* * 查询定薪人员+模糊查询*******
*/ */
@PostMapping(value = "/fixedstaff") @PostMapping(value = "/fixedstaff")
@ApiOperation(value = "查询定薪人员", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "查询定薪人员/分页", httpMethod = "POST", notes = "接口发布说明")
public ResponseResult FixedSalarStaff(@CurrentUser UserBean userBean,@RequestBody SearchSalariedPeopleDto search) { public Result<Object> FixedSalarStaff(@CurrentUser UserBean userBean,@RequestBody SearchSalariedPeopleDto search) {
search.setOrgcode(userBean.getOrgCode()); search.setOrgcode(userBean.getOrgCode());
if(("0").equals(search.getStatus())) {//全部 if(("0").equals(search.getStatus())) {//全部
search.setStatus(""); search.setStatus("");
...@@ -835,8 +836,13 @@ public class SalaryManagementController { ...@@ -835,8 +836,13 @@ public class SalaryManagementController {
}else { }else {
search.setStatus("3"); 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(), "获取自定义薪资组表头信息");
} }
/** /**
......
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import java.util.List; 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 org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.xcgl.XcglAssoXzdazdy; 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;
/** /**
...@@ -26,7 +25,7 @@ public interface XcglAssoXzdazdyMapper extends BaseMapper<XcglAssoXzdazdy> { ...@@ -26,7 +25,7 @@ public interface XcglAssoXzdazdyMapper extends BaseMapper<XcglAssoXzdazdy> {
int dazdyupdate(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); List<ChangeSalaryDto> AchieveSalaryAdjustment(Integer orgcode,Integer empnum);
......
...@@ -197,12 +197,12 @@ ...@@ -197,12 +197,12 @@
from yggl_main_emp emp 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_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 LEFT JOIN xcgl_asso_xzdaz as xzdaz on xzdaz.xzdadxid = dadx.id
where emp.org_code = #{orgcode} where emp.org_code = #{param.orgcode}
<if test="status != ''" > <if test="param.status != ''" >
and emp.job_status = #{status} and emp.job_status = #{param.status}
</if> </if>
<if test="text != ''" > <if test="param.text != ''" >
and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text}) and (emp.`name` like CONCAT('%',#{param.text},'%') or emp.emp_num = #{param.text})
</if> </if>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment