From 8b53d5c31053cbaa8200e38206753b553135f0d6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 26 Oct 2022 15:43:24 +0800 Subject: [PATCH] emm --- .../com/epmet/dto/IcEmployeeRegisterDTO.java | 16 ++++++++++++++++ .../controller/IcEmployeeRegisterController.java | 8 +++----- .../IcGroupPeopleRegisterController.java | 7 +++---- .../epmet/service/IcEmployeeRegisterService.java | 3 +-- .../service/IcGroupPeopleRegisterService.java | 3 +-- .../impl/IcEmployeeRegisterServiceImpl.java | 9 ++++++--- .../impl/IcGroupPeopleRegisterServiceImpl.java | 8 +++++--- 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java index 16ec39997f..4a77649bdd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java @@ -2,8 +2,13 @@ package com.epmet.dto; import java.io.Serializable; import java.util.Date; + +import com.epmet.commons.tools.validator.group.AddGroup; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * 员工登记表 @@ -24,28 +29,39 @@ public class IcEmployeeRegisterDTO implements Serializable { /** * 客户id */ + @NotBlank(message = "customerId不能为空",groups = {AddGroup.class}) private String customerId; /** * 场所id */ + @NotBlank(message = "enterpriseId不能为空",groups = {AddGroup.class}) private String enterpriseId; /** * 姓名 */ + @NotBlank(message = "name不能为空",groups = {AddGroup.class}) private String name; /** * 手机号 */ + @NotBlank(message = "mobile不能为空",groups = {AddGroup.class}) private String mobile; /** * 身份证号或护照号 */ + @NotBlank(message = "idCard不能为空",groups = {AddGroup.class}) private String idCard; + @NotNull(message = "ymjzCount不能为空",groups = {AddGroup.class}) + private Integer ymjzCount; + + @NotNull(message = "latestNatTime不能为空",groups = {AddGroup.class}) + private Date latestNatTime; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java index 270d3c7f9b..7e5e6d1e38 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java @@ -37,14 +37,14 @@ public class IcEmployeeRegisterController { return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @PostMapping(value = "{id}") public Result get(@PathVariable("id") String id){ IcEmployeeRegisterDTO data = icEmployeeRegisterService.get(id); return new Result().ok(data); } @NoRepeatSubmit - @PostMapping("save") + @PostMapping("add") public Result save(@RequestBody IcEmployeeRegisterDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -62,9 +62,7 @@ public class IcEmployeeRegisterController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); + public Result delete(@RequestBody List ids){ icEmployeeRegisterService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java index ffc54df114..601c1688e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.service.IcGroupPeopleRegisterService; +import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,7 +38,7 @@ public class IcGroupPeopleRegisterController { return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @PostMapping(value = "{id}") public Result get(@PathVariable("id") String id){ IcGroupPeopleRegisterDTO data = icGroupPeopleRegisterService.get(id); return new Result().ok(data); @@ -62,9 +63,7 @@ public class IcGroupPeopleRegisterController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); + public Result delete(@RequestBody List ids){ icGroupPeopleRegisterService.delete(ids); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java index 1ccb4a8b5c..bf7f89162f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java @@ -68,11 +68,10 @@ public interface IcEmployeeRegisterService extends BaseService ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java index d38ba6d9e9..818c92f448 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java @@ -68,11 +68,10 @@ public interface IcGroupPeopleRegisterService extends BaseService ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java index 57cd680a61..073fb7af2d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.entity.IcEmployeeRegisterEntity; import com.epmet.service.IcEmployeeRegisterService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,6 +64,7 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl ids) { + if (CollectionUtils.isNotEmpty(ids)){ + baseDao.deleteBatchIds(ids); + } } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java index 8f3cd6e4b6..8f4920bdee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java @@ -10,6 +10,7 @@ import com.epmet.dao.IcGroupPeopleRegisterDao; import com.epmet.dto.IcGroupPeopleRegisterDTO; import com.epmet.entity.IcGroupPeopleRegisterEntity; import com.epmet.service.IcGroupPeopleRegisterService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -75,9 +76,10 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl ids) { + if (CollectionUtils.isNotEmpty(ids)){ + baseDao.deleteBatchIds(ids); + } } } \ No newline at end of file