test

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java

@@ -7,11 +7,10 @@ import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcEmployeeRegisterDTO;
 import com.epmet.dto.form.EmployeeRegisterListFormDTO;
 import com.epmet.dto.result.EmployeeRegisterListResultDTO;
@@ -19,7 +18,6 @@ import com.epmet.service.IcEmployeeRegisterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -50,7 +48,7 @@ public class IcEmployeeRegisterController {
     }
 
     /**
-     * @Description 新增
+     * @Description 新增 员工登记：http://yapi.elinkservice.cn/project/102/interface/api/8214
      * @param dto
      * @Author zxc
      * @Date 2022/10/27 08:57

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java

@@ -3,18 +3,15 @@ package com.epmet.controller;
 import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 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.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -44,6 +41,11 @@ public class IcGroupPeopleRegisterController {
         return new Result<IcGroupPeopleRegisterDTO>().ok(data);
     }
 
+    /**
+     * 受众群体登记 http://yapi.elinkservice.cn/project/102/interface/api/8220
+     * @param dto
+     * @return
+     */
     @NoRepeatSubmit
     @PostMapping("add")
     public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java

@@ -3,12 +3,12 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 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.dto.form.EmployeeRegisterListFormDTO;
@@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -81,17 +80,19 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeReg
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcEmployeeRegisterDTO dto) {
+        IcEmployeeRegisterDetailEntity detailEntity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class);
         // 先看看存在不
-        IcEmployeeRegisterEntity employeeRegisterEntity = baseDao.getEmployeeRegisterByIdCard(dto.getIdCard());
-        IcEmployeeRegisterEntity entity;
-        if (null == employeeRegisterEntity){
-            entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class);
-            insert(entity);
+        IcEmployeeRegisterEntity origin = baseDao.getEmployeeRegisterByIdCard(dto.getIdCard());
+        if (null == origin){
+            IcEmployeeRegisterEntity insertEntity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class);
+            insert(insertEntity);
+            detailEntity.setRegisterId(insertEntity.getId());
         }else {
-            entity = employeeRegisterEntity;
+            origin.setMobile(dto.getMobile());
+            origin.setName(dto.getName());
+            updateById(origin);
+            detailEntity.setRegisterId(origin.getId());
         }
-        IcEmployeeRegisterDetailEntity detailEntity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class);
-        detailEntity.setRegisterId(entity.getId());
         icEmployeeRegisterDetailService.insert(detailEntity);
     }