From 631abd8412b0ada88a422c537f49d135b2dd559c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 26 Oct 2022 17:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcGroupPeopleRegisterDTO.java   | 10 ++++++++++
 .../controller/IcGroupPeopleRegisterController.java    |  2 +-
 .../service/impl/IcEmployeeRegisterServiceImpl.java    |  9 ++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java
index bc4e876b7c..f55ddf7420 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.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,26 +29,31 @@ public class IcGroupPeopleRegisterDTO implements Serializable {
     /**
      * 客户id
      */
+    @NotBlank(message = "customerId不能为空",groups = {AddGroup.class})
 	private String customerId;
 
     /**
      * 场所id
      */
+    @NotBlank(message = "enterpriseId不能为空",groups = {AddGroup.class})
 	private String enterpriseId;
 
     /**
      * 核酸检测时间：yyyy-MM-dd 日期
      */
+    @NotNull(message = "natTime不能为空",groups = {AddGroup.class})
 	private Date natTime;
 
     /**
      * 受众人数
      */
+    @NotNull(message = "szTotal不能为空",groups = {AddGroup.class})
 	private Integer szTotal;
 
     /**
      * 核酸检测人数
      */
+    @NotNull(message = "customerId不能为空",groups = {AddGroup.class})
 	private Integer hsjcTotal;
 
     /**
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 601c1688e8..31d6189892 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
@@ -45,7 +45,7 @@ public class IcGroupPeopleRegisterController {
     }
 
     @NoRepeatSubmit
-    @PostMapping("save")
+    @PostMapping("add")
     public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
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 073fb7af2d..3f72e7261d 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
@@ -8,7 +8,9 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcEmployeeRegisterDao;
 import com.epmet.dto.IcEmployeeRegisterDTO;
+import com.epmet.entity.IcEmployeeRegisterDetailEntity;
 import com.epmet.entity.IcEmployeeRegisterEntity;
+import com.epmet.service.IcEmployeeRegisterDetailService;
 import com.epmet.service.IcEmployeeRegisterService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +31,9 @@ import java.util.Map;
 @Service
 public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeRegisterDao, IcEmployeeRegisterEntity> implements IcEmployeeRegisterService {
 
+    @Autowired
+    private IcEmployeeRegisterDetailService icEmployeeRegisterDetailService;
+
     @Override
     public PageData<IcEmployeeRegisterDTO> page(Map<String, Object> params) {
         IPage<IcEmployeeRegisterEntity> page = baseDao.selectPage(
@@ -64,8 +69,10 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeReg
     @Transactional(rollbackFor = Exception.class)
     public void save(IcEmployeeRegisterDTO dto) {
         IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class);
-
         insert(entity);
+        IcEmployeeRegisterDetailEntity detailEntity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class);
+        detailEntity.setRegisterId(entity.getId());
+        icEmployeeRegisterDetailService.insert(detailEntity);
     }
 
     @Override