Merge branch 'release/2.11.1.2402.01' into release/个税版本

This commit is contained in:
钱涛 2024-03-07 09:54:35 +08:00
commit 730166d771
2 changed files with 22 additions and 0 deletions

View File

@ -92,6 +92,18 @@ public class SalarySobController {
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);
}
/**
* 薪资账套基本信息表单
*/

View File

@ -94,6 +94,16 @@ public class SalarySobWrapper extends Service {
return dtoPage;
}
/**
* 薪资账套列表
*
* @return
*/
public List<SalarySobPO> listAll() {
return getSalarySobService(user).listAll();
}
private void handleSalarySobBackItemHistory(SalarySobListQueryParam queryParam) {
queryParam.setPageSize(100000);
List<SalarySobPO> list = getSalarySobService(user).listPageByParam(queryParam).getList();