1班次管理列表没过滤isDelete

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyShiftController.java

@@ -108,7 +108,7 @@ public class DutyShiftController extends BaseController {
         Page<DutyShiftDto> page = new Page<>();
         page.setCurrent(current);
         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 {
     @GetMapping(value = "/list")
     public ResponseModel<List<DutyShiftDto>> selectForList(HttpServletRequest request) {
         String appKey = request.getHeader("appKey");
-        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(appKey));
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(appKey,false));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -89,7 +89,7 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
                 .le(endDate != null, DutyPersonShift::getDutyDate, endDate)).stream().map(e -> {
             DutyPersonShiftDto dto = new DutyPersonShiftDto();
             Bean.copyExistPropertis(e, dto);
-            dto.setShiftName(keyNameMap.get(e.getSequenceNbr()));
+            dto.setShiftName(keyNameMap.get(e.getShiftId()));
             return dto;
         }).collect(Collectors.toList());
         m.put("dutyShift", personShiftList);

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyShiftServiceImpl.java

@@ -21,14 +21,14 @@ public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, D
     /**
      * 分页查询
      */
-    public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey) {
-        return this.queryForPage(page, null, false, appKey);
+    public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey, Boolean isDelete) {
+        return this.queryForPage(page, null, false, appKey, isDelete);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<DutyShiftDto> queryForDutyShiftList(String appKey) {
-        return this.queryForList("", false, appKey);
+    public List<DutyShiftDto> queryForDutyShiftList(String appKey, Boolean isDelete) {
+        return this.queryForList("", false, appKey, isDelete);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -527,7 +527,7 @@ public class ExcelController extends BaseController {
 
     private String[] getDutyNameList() {
         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()));
         String[] dutyNameList = dutyShiftList.toArray(new String[dutyShiftList.size()]);
         return dutyNameList;