Commit 43293d76 authored by suhuiguang's avatar suhuiguang

1班次管理列表没过滤isDelete

parent 807654a0
...@@ -108,7 +108,7 @@ public class DutyShiftController extends BaseController { ...@@ -108,7 +108,7 @@ public class DutyShiftController extends BaseController {
Page<DutyShiftDto> page = new Page<>(); Page<DutyShiftDto> page = new Page<>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page, appKey)); return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page, appKey,false));
} }
/** /**
...@@ -121,6 +121,6 @@ public class DutyShiftController extends BaseController { ...@@ -121,6 +121,6 @@ public class DutyShiftController extends BaseController {
@GetMapping(value = "/list") @GetMapping(value = "/list")
public ResponseModel<List<DutyShiftDto>> selectForList(HttpServletRequest request) { public ResponseModel<List<DutyShiftDto>> selectForList(HttpServletRequest request) {
String appKey = request.getHeader("appKey"); String appKey = request.getHeader("appKey");
return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(appKey)); return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(appKey,false));
} }
} }
...@@ -89,7 +89,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService { ...@@ -89,7 +89,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
.le(endDate != null, DutyPersonShift::getDutyDate, endDate)).stream().map(e -> { .le(endDate != null, DutyPersonShift::getDutyDate, endDate)).stream().map(e -> {
DutyPersonShiftDto dto = new DutyPersonShiftDto(); DutyPersonShiftDto dto = new DutyPersonShiftDto();
Bean.copyExistPropertis(e, dto); Bean.copyExistPropertis(e, dto);
dto.setShiftName(keyNameMap.get(e.getSequenceNbr())); dto.setShiftName(keyNameMap.get(e.getShiftId()));
return dto; return dto;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
m.put("dutyShift", personShiftList); m.put("dutyShift", personShiftList);
......
...@@ -21,14 +21,14 @@ public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, D ...@@ -21,14 +21,14 @@ public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, D
/** /**
* 分页查询 * 分页查询
*/ */
public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey) { public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey, Boolean isDelete) {
return this.queryForPage(page, null, false, appKey); return this.queryForPage(page, null, false, appKey, isDelete);
} }
/** /**
* 列表查询 示例 * 列表查询 示例
*/ */
public List<DutyShiftDto> queryForDutyShiftList(String appKey) { public List<DutyShiftDto> queryForDutyShiftList(String appKey, Boolean isDelete) {
return this.queryForList("", false, appKey); return this.queryForList("", false, appKey, isDelete);
} }
} }
...@@ -527,7 +527,7 @@ public class ExcelController extends BaseController { ...@@ -527,7 +527,7 @@ public class ExcelController extends BaseController {
private String[] getDutyNameList() { private String[] getDutyNameList() {
List<String> dutyShiftList = new ArrayList<>(); List<String> dutyShiftList = new ArrayList<>();
List<DutyShiftDto> dutyShiftDtoList = dutyShiftService.queryForDutyShiftList(null); List<DutyShiftDto> dutyShiftDtoList = dutyShiftService.queryForDutyShiftList(null,false);
dutyShiftDtoList.forEach(item -> dutyShiftList.add(item.getName() + "@" + item.getSequenceNbr())); dutyShiftDtoList.forEach(item -> dutyShiftList.add(item.getName() + "@" + item.getSequenceNbr()));
String[] dutyNameList = dutyShiftList.toArray(new String[dutyShiftList.size()]); String[] dutyNameList = dutyShiftList.toArray(new String[dutyShiftList.size()]);
return dutyNameList; return dutyNameList;
......
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