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 ef43bc77..f35d4de8 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 @@ -1136,6 +1136,19 @@ public class EamController { return R.ok().put("rows", list); } + /** + * @description: 获取审核人员列表 + * @author: fengyuan_yang + * @date: 2023/5/24 13:10 + * @param: [inData] + * @return: com.xujie.sys.common.utils.R + **/ + @PostMapping("/getCheckerList") + public R getCheckerList(@RequestBody EamAdminData data){ + List list = eamService.getCheckerList(data); + return R.ok().put("rows", list); + } + //---------------点检工单------------------- diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java index ef65acdb..a62217ed 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java @@ -9,6 +9,7 @@ import java.util.Date; public class EamAdminData extends QueryPage { private String site; + private Integer userId; private String adminID; private String adminName; private String phone; @@ -31,6 +32,14 @@ public class EamAdminData extends QueryPage { // 更新人 private String updateBy; + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + public String getDepartmentName() { return departmentName; } 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 6c938152..69c00757 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 @@ -1114,4 +1114,6 @@ public interface EamMapper { void saveWorkPlanItemAvailable(EamWorkOrderItemInData data); void cancelOrderAll(EamWorkOrderInData inData); + + List getCheckerList(EamAdminData data); } 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 6e268433..39e6f1ac 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 @@ -1086,4 +1086,6 @@ public interface EamService { void imageDelete(SysOssEntity data); void refreshItem(EamWorkOrderItemInData data); + + List getCheckerList(EamAdminData data); } 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 bb2dee77..905db7a3 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 @@ -1904,6 +1904,19 @@ public class EamServiceImpl implements EamService { return list; } + /** + * @description: 获取审核人员列表 + * @author: fengyuan_yang + * @date: 2023/5/24 13:12 + * @param: [data] + * @return: java.util.List + **/ + @Override + public List getCheckerList(EamAdminData data) { + List list = eamMapper.getCheckerList(data); + return list; + } + /** * @description: 点检工单审核 * @author: fengyuan_yang diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index df7e58b9..89b9b187 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -1293,6 +1293,27 @@ b.MinValue,b.ItemRemark,b.ItemType + + + UPDATE eam_workOrder