diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index bd23c54..b84ea9e 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ErrorResponseData; @@ -101,12 +102,23 @@ public Object add(@RequestBody Person person) { try { person.setDelflag("0"); + // 人员照片 String photoData = person.getPhoto(); if(ToolUtil.isNotEmpty(person.getPhoto())){ String photoPath = fileService.saveFile(photoData); person.setPhoto(photoPath); } person.setOprationId(permissionService.getCurrLoginUser().getId()); + // 人员ID、编号 + Long id = IdWorker.getId(); + person.setId(id); + // TODO 暂时以IdWorker作为自动生成的personCode + if(ToolUtil.isEmpty(person.getPersonCode())){ + person.setPersonCode(String.valueOf(id)); + } + if(ToolUtil.isEmpty(person.getIdCardNo())){ + person.setIdCardNo(null); + } irisPersonService.insert(person); if(ToolUtil.isNotEmpty(person.getPhoto())){ IrisPersonPhoto personPhoto = new IrisPersonPhoto(); @@ -137,6 +149,13 @@ person.setPhoto(photoPath); person.setOprationId(permissionService.getCurrLoginUser().getId()); } + // TODO 暂时以IdWorker作为自动生成的personCode + if(ToolUtil.isEmpty(person.getPersonCode())){ + person.setPersonCode(String.valueOf(person.getId())); + } + if(ToolUtil.isEmpty(person.getIdCardNo())){ + person.setIdCardNo(null); + } irisPersonService.update(person); if(ToolUtil.isNotEmpty(photoData)&&photoData.startsWith("data:image")){ IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); @@ -211,7 +230,8 @@ query.eq(PersonConst.TABLE_SEX, sex); } if (ToolUtil.isNotEmpty(keywords)) { - query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + query.like(PersonConst.TABLE_PERSONNAME, keywords); +// query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); } query.andNew().eq(PersonConst.TABLE_DELFLAG, 0); List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index bd23c54..b84ea9e 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ErrorResponseData; @@ -101,12 +102,23 @@ public Object add(@RequestBody Person person) { try { person.setDelflag("0"); + // 人员照片 String photoData = person.getPhoto(); if(ToolUtil.isNotEmpty(person.getPhoto())){ String photoPath = fileService.saveFile(photoData); person.setPhoto(photoPath); } person.setOprationId(permissionService.getCurrLoginUser().getId()); + // 人员ID、编号 + Long id = IdWorker.getId(); + person.setId(id); + // TODO 暂时以IdWorker作为自动生成的personCode + if(ToolUtil.isEmpty(person.getPersonCode())){ + person.setPersonCode(String.valueOf(id)); + } + if(ToolUtil.isEmpty(person.getIdCardNo())){ + person.setIdCardNo(null); + } irisPersonService.insert(person); if(ToolUtil.isNotEmpty(person.getPhoto())){ IrisPersonPhoto personPhoto = new IrisPersonPhoto(); @@ -137,6 +149,13 @@ person.setPhoto(photoPath); person.setOprationId(permissionService.getCurrLoginUser().getId()); } + // TODO 暂时以IdWorker作为自动生成的personCode + if(ToolUtil.isEmpty(person.getPersonCode())){ + person.setPersonCode(String.valueOf(person.getId())); + } + if(ToolUtil.isEmpty(person.getIdCardNo())){ + person.setIdCardNo(null); + } irisPersonService.update(person); if(ToolUtil.isNotEmpty(photoData)&&photoData.startsWith("data:image")){ IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); @@ -211,7 +230,8 @@ query.eq(PersonConst.TABLE_SEX, sex); } if (ToolUtil.isNotEmpty(keywords)) { - query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + query.like(PersonConst.TABLE_PERSONNAME, keywords); +// query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); } query.andNew().eq(PersonConst.TABLE_DELFLAG, 0); List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java index c2b0114..02081e5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java @@ -135,7 +135,9 @@ Person person = new Person(); try { person.setName(this.name); - person.setIdCardNo(this.idCardNo); + if(ToolUtil.isNotEmpty(this.idCardNo)){ + person.setIdCardNo(this.idCardNo); + } person.setDelflag("0"); Map mapExt = new HashMap<>(); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index bd23c54..b84ea9e 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.exceptions.MybatisPlusException; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ErrorResponseData; @@ -101,12 +102,23 @@ public Object add(@RequestBody Person person) { try { person.setDelflag("0"); + // 人员照片 String photoData = person.getPhoto(); if(ToolUtil.isNotEmpty(person.getPhoto())){ String photoPath = fileService.saveFile(photoData); person.setPhoto(photoPath); } person.setOprationId(permissionService.getCurrLoginUser().getId()); + // 人员ID、编号 + Long id = IdWorker.getId(); + person.setId(id); + // TODO 暂时以IdWorker作为自动生成的personCode + if(ToolUtil.isEmpty(person.getPersonCode())){ + person.setPersonCode(String.valueOf(id)); + } + if(ToolUtil.isEmpty(person.getIdCardNo())){ + person.setIdCardNo(null); + } irisPersonService.insert(person); if(ToolUtil.isNotEmpty(person.getPhoto())){ IrisPersonPhoto personPhoto = new IrisPersonPhoto(); @@ -137,6 +149,13 @@ person.setPhoto(photoPath); person.setOprationId(permissionService.getCurrLoginUser().getId()); } + // TODO 暂时以IdWorker作为自动生成的personCode + if(ToolUtil.isEmpty(person.getPersonCode())){ + person.setPersonCode(String.valueOf(person.getId())); + } + if(ToolUtil.isEmpty(person.getIdCardNo())){ + person.setIdCardNo(null); + } irisPersonService.update(person); if(ToolUtil.isNotEmpty(photoData)&&photoData.startsWith("data:image")){ IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); @@ -211,7 +230,8 @@ query.eq(PersonConst.TABLE_SEX, sex); } if (ToolUtil.isNotEmpty(keywords)) { - query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); + query.like(PersonConst.TABLE_PERSONNAME, keywords); +// query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); } query.andNew().eq(PersonConst.TABLE_DELFLAG, 0); List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java index c2b0114..02081e5 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonAtdDTO.java @@ -135,7 +135,9 @@ Person person = new Person(); try { person.setName(this.name); - person.setIdCardNo(this.idCardNo); + if(ToolUtil.isNotEmpty(this.idCardNo)){ + person.setIdCardNo(this.idCardNo); + } person.setDelflag("0"); Map mapExt = new HashMap<>(); diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index ac8ed33..f896e50 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.toolkit.IdWorker; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.constant.Const; import com.casic.missiles.core.common.exception.BizExceptionEnum; @@ -180,38 +181,50 @@ if (ToolUtil.isEmpty(personDto.getName())) { results.add("第" + index + "行，姓名不能为空"); break; - } else if (ToolUtil.isEmpty(personDto.getIdCardNo())) { - results.add("第" + index + "行，身份证号不能为空"); - break; - } else if (ToolUtil.isEmpty(personDto.getInitAnnualLeave())) { - results.add("第" + index + "行，年假天数不能为空"); - break; - } else if (ToolUtil.isEmpty(personDto.getAnnualLeave())) { - results.add("第" + index + "行，剩余年假天数不能为空"); - break; - } else { - Long deptid = person.getDeptid(); - person = personDto.toPerson(); - person.setDeptid(deptid); - person.setPersonType(PersonTypeEnums.STAFF.getValue()); - person.setOprationId(permissionService.getCurrLoginUser().getId()); - // 根据身份证号得到生日和性别 + } + +// if (ToolUtil.isEmpty(personDto.getIdCardNo())) { +// results.add("第" + index + "行，身份证号不能为空"); +// break; +// } + if(ToolUtil.isNotEmpty(personDto.getIsKaoqin()) && "否".equals(personDto.getIsKaoqin())) { + if (ToolUtil.isEmpty(personDto.getInitAnnualLeave())) { + results.add("第" + index + "行，年假天数不能为空"); + break; + } + if (ToolUtil.isEmpty(personDto.getAnnualLeave())) { + results.add("第" + index + "行，剩余年假天数不能为空"); + break; + } + } + + Long deptid = person.getDeptid(); + person = personDto.toPerson(); + person.setDeptid(deptid); + person.setPersonType(PersonTypeEnums.STAFF.getValue()); + person.setOprationId(permissionService.getCurrLoginUser().getId()); + // 根据身份证号得到生日和性别 + if(ToolUtil.isNotEmpty(personDto.getIdCardNo())){ String idCardNo = personDto.getIdCardNo(); String birth = ""; - if (idCardNo.length() == 15) birth = "19" + idCardNo.substring(6, 8)+"-"+idCardNo.substring(8,10)+"-"+idCardNo.substring(10,12); - else if (idCardNo.length() == 18) - { + if (idCardNo.length() == 15) { + birth = "19" + idCardNo.substring(6, 8)+"-"+idCardNo.substring(8,10)+"-"+idCardNo.substring(10,12); + } else if (idCardNo.length() == 18) { birth = idCardNo.substring(6, 10)+"-"+idCardNo.substring(10,12)+"-"+idCardNo.substring(12,14); - if ((Convert.toInt(idCardNo.substring(16, 17)) % 2) == 1)//奇数 - { + if ((Convert.toInt(idCardNo.substring(16, 17)) % 2) == 1){ person.setSex("1"); + } else { + person.setSex("2"); } - else person.setSex("2"); } person.setBirthday(Date.valueOf(birth)); - - irisPersonService.insert(person); } + + // 设置id和code + Long id = IdWorker.getId(); + person.setId(id); + person.setPersonCode(String.valueOf(id)); + irisPersonService.insert(person); index++; } } catch(DuplicateKeyException e){