diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java index 4fe3cff5..965cadcf 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java @@ -2167,6 +2167,11 @@ public class EamController { PageUtils page = eamService.eamCheckRecordSearch(data); return R.ok().put("page", page); } + @PostMapping(value="/eamCheckRecordSearch2") + public R eamCheckRecordSearch2(@RequestBody EamWorkOrderInData data) { + PageUtils page = eamService.eamCheckRecordSearch2(data); + return R.ok().put("page", page); + } @PostMapping(value="/eamDefectRecordSearch") public R eamDefectRecordSearch(@RequestBody EamWorkOrderInData data){ diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index 8ae29335..6c84e69a 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java @@ -385,6 +385,8 @@ public interface EamMapper { IPage eamCheckRecordSearch(Page eamWorkOrderInDataPage, @Param("query") EamWorkOrderInData data); + IPage eamCheckRecordSearch2(Page eamWorkOrderInDataPage, @Param("query") EamWorkOrderInData data); + IPage eamDefectRecordSearch(Page eamWorkOrderInDataPage, @Param("query") EamWorkOrderInData data); List getUserRoleList(); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java index dac6fee8..08ecb325 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java @@ -1118,6 +1118,8 @@ public interface EamService { PageUtils eamCheckRecordSearch(EamWorkOrderInData data); + PageUtils eamCheckRecordSearch2(EamWorkOrderInData data); + PageUtils eamDefectRecordSearch(EamWorkOrderInData data); List getUserRoleList(); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 8fc15909..2b6c4206 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -3351,6 +3351,13 @@ public class EamServiceImpl implements EamService { return new PageUtils(resultList); } + @Override + public PageUtils eamCheckRecordSearch2(EamWorkOrderInData data) { + // 查出全部要执行的工单 + IPage resultList = this.eamMapper.eamCheckRecordSearch2(new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } + @Override public PageUtils eamDefectRecordSearch(EamWorkOrderInData data) { if (StringUtils.isNotBlank(data.getDepartmentName())) { diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 15abb6f5..3437497f 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -3004,6 +3004,89 @@ + +