Merge branch 'release/2.11.1.2402.01' into release/个税版本
This commit is contained in:
commit
730166d771
|
|
@ -92,6 +92,18 @@ public class SalarySobController {
|
||||||
return new ResponseResult<SalarySobListQueryParam, PageInfo<SalarySobListDTO>>(user).run(getSalarySobWrapper(user)::listPage, queryParam);
|
return new ResponseResult<SalarySobListQueryParam, PageInfo<SalarySobListDTO>>(user).run(getSalarySobWrapper(user)::listPage, queryParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 薪资账套列表
|
||||||
|
*/
|
||||||
|
@POST
|
||||||
|
@Path("/listAll")
|
||||||
|
@Produces(MediaType.APPLICATION_JSON)
|
||||||
|
public String listAll(@Context HttpServletRequest request, @Context HttpServletResponse response) {
|
||||||
|
User user = HrmUserVarify.getUser(request, response);
|
||||||
|
return new ResponseResult<SalarySobListQueryParam, List<SalarySobPO>>(user).run(getSalarySobWrapper(user)::listAll);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 薪资账套基本信息表单
|
* 薪资账套基本信息表单
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -94,6 +94,16 @@ public class SalarySobWrapper extends Service {
|
||||||
return dtoPage;
|
return dtoPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 薪资账套列表
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public List<SalarySobPO> listAll() {
|
||||||
|
return getSalarySobService(user).listAll();
|
||||||
|
}
|
||||||
|
|
||||||
private void handleSalarySobBackItemHistory(SalarySobListQueryParam queryParam) {
|
private void handleSalarySobBackItemHistory(SalarySobListQueryParam queryParam) {
|
||||||
queryParam.setPageSize(100000);
|
queryParam.setPageSize(100000);
|
||||||
List<SalarySobPO> list = getSalarySobService(user).listPageByParam(queryParam).getList();
|
List<SalarySobPO> list = getSalarySobService(user).listPageByParam(queryParam).getList();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue