diff --git a/src/main/java/com/weaver/seconddev/entry/controller/EntryManageController.java b/src/main/java/com/weaver/seconddev/entry/controller/EntryManageController.java index cd9bca7..f4a41af 100644 --- a/src/main/java/com/weaver/seconddev/entry/controller/EntryManageController.java +++ b/src/main/java/com/weaver/seconddev/entry/controller/EntryManageController.java @@ -27,8 +27,8 @@ public class EntryManageController { HrComEstService hrComEstService; @GetMapping("/checkJobNum") - public WeaResult> checkJobNum(@RequestParam("jobNum") String jobNum) { - return entryManageService.checkJobNum(jobNum); + public WeaResult> checkJobNum(@RequestParam("jobNum") String jobNum,@RequestParam("userName") String userName) { + return entryManageService.checkJobNum(jobNum,userName); } @PostMapping("/uploadFiles") diff --git a/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java b/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java index dfdc150..3dd55be 100644 --- a/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java +++ b/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java @@ -21,6 +21,8 @@ public interface EntryManageMapper { */ Long getEntryRecordIdByJobNum(@Param("param") BaseParam param, @Param("jobNum") String jobNum); + Long getEntryRecordIdByJobNumAndName(@Param("param") BaseParam param, @Param("jobNum") String jobNum,@Param("userName") String userName); + Long updateFilesInfo(@Param("param") BaseParam param, @Param("employeeId") Long employeeId); } diff --git a/src/main/java/com/weaver/seconddev/entry/service/EntryManageService.java b/src/main/java/com/weaver/seconddev/entry/service/EntryManageService.java index 60c1725..f677cb9 100644 --- a/src/main/java/com/weaver/seconddev/entry/service/EntryManageService.java +++ b/src/main/java/com/weaver/seconddev/entry/service/EntryManageService.java @@ -15,9 +15,10 @@ public interface EntryManageService { * 校验工号 * * @param jobNum 工号 + * @param userName 姓名 * @return */ - WeaResult> checkJobNum(String jobNum); + WeaResult> checkJobNum(String jobNum,String userName); /** * 上传文件 diff --git a/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java b/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java index 2bbac41..085f2d8 100644 --- a/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java +++ b/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java @@ -60,14 +60,14 @@ public class EntryManageServiceImpl implements EntryManageService { BaseParam baseParam = new BaseParam(); @Override - public WeaResult> checkJobNum(String jobNum) { + public WeaResult> checkJobNum(String jobNum,String userName) { Map dataMap = new HashMap<>(); dataMap.put("isExist", false); if (StringUtils.isBlank(jobNum)) { return WeaResult.fail("工号获取异常", true); } - Long empIdByJobNum = entryManageMapper.getEntryRecordIdByJobNum(baseParam, jobNum); + Long empIdByJobNum = entryManageMapper.getEntryRecordIdByJobNumAndName(baseParam, jobNum,userName); dataMap.put("isExist", null != empIdByJobNum); dataMap.put("empId", empIdByJobNum); return WeaResult.success(dataMap); diff --git a/src/main/resources/mapper/entry/mapper/EntryManageMapper.xml b/src/main/resources/mapper/entry/mapper/EntryManageMapper.xml index 315c41d..f34293c 100644 --- a/src/main/resources/mapper/entry/mapper/EntryManageMapper.xml +++ b/src/main/resources/mapper/entry/mapper/EntryManageMapper.xml @@ -26,4 +26,10 @@ where t1.tenant_key = #{param.tenantKey} and t1.delete_type = 0 and t1.job_num = #{jobNum} +