|
@@ -1533,18 +1533,11 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
|
|
|
|
|
|
//公司级:报销报表详细
|
|
|
public Page<WorkReimbursement> findReimbursementReportPage(Page<WorkReimbursement> page, WorkReimbursement workReimbursement,String officeId,String bigDateType,String smallDateType,String year) {
|
|
|
- workReimbursement.getSqlMap().put("dsf", dataScopeFilter(workReimbursement.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_REIMBURSEMENT.getValue()));
|
|
|
//将获取的datetype转为需要的具体时间
|
|
|
Map<String,String> map = statementCompanyComprehensiveService.getDateNew(new Integer(bigDateType),new Integer(smallDateType),new Integer(year));
|
|
|
String beginDate = map.get("beginDate");
|
|
|
String endDate = map.get("endDate");
|
|
|
|
|
|
- //获取权限数据并删除第一个and字符
|
|
|
- String str = workReimbursement.getSqlMap().get("dsf");
|
|
|
- Matcher matcher = Pattern.compile("and").matcher(str);
|
|
|
- if (matcher.find()) {
|
|
|
- workReimbursement.getSqlMap().put("dsf",str.substring(0,matcher.start()) + str.substring(matcher.start()+3));
|
|
|
- }
|
|
|
workReimbursement.setCreateBy(UserUtils.getUser());
|
|
|
if(StringUtils.isNotBlank(workReimbursement.getOfficeId())){
|
|
|
//查询该选择节点下所有的部门Id
|