zxc 3 years ago
parent
commit
631abd8412
  1. 10
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcGroupPeopleRegisterDTO.java
  2. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java
  3. 9
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java

10
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.io.Serializable;
import java.util.Date; import java.util.Date;
import com.epmet.commons.tools.validator.group.AddGroup;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/** /**
* 受众群体登记表 * 受众群体登记表
@ -24,26 +29,31 @@ public class IcGroupPeopleRegisterDTO implements Serializable {
/** /**
* 客户id * 客户id
*/ */
@NotBlank(message = "customerId不能为空",groups = {AddGroup.class})
private String customerId; private String customerId;
/** /**
* 场所id * 场所id
*/ */
@NotBlank(message = "enterpriseId不能为空",groups = {AddGroup.class})
private String enterpriseId; private String enterpriseId;
/** /**
* 核酸检测时间yyyy-MM-dd 日期 * 核酸检测时间yyyy-MM-dd 日期
*/ */
@NotNull(message = "natTime不能为空",groups = {AddGroup.class})
private Date natTime; private Date natTime;
/** /**
* 受众人数 * 受众人数
*/ */
@NotNull(message = "szTotal不能为空",groups = {AddGroup.class})
private Integer szTotal; private Integer szTotal;
/** /**
* 核酸检测人数 * 核酸检测人数
*/ */
@NotNull(message = "customerId不能为空",groups = {AddGroup.class})
private Integer hsjcTotal; private Integer hsjcTotal;
/** /**

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

@ -45,7 +45,7 @@ public class IcGroupPeopleRegisterController {
} }
@NoRepeatSubmit @NoRepeatSubmit
@PostMapping("save") @PostMapping("add")
public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){ public Result save(@RequestBody IcGroupPeopleRegisterDTO dto){
//效验数据 //效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);

9
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.commons.tools.constant.FieldConstant;
import com.epmet.dao.IcEmployeeRegisterDao; import com.epmet.dao.IcEmployeeRegisterDao;
import com.epmet.dto.IcEmployeeRegisterDTO; import com.epmet.dto.IcEmployeeRegisterDTO;
import com.epmet.entity.IcEmployeeRegisterDetailEntity;
import com.epmet.entity.IcEmployeeRegisterEntity; import com.epmet.entity.IcEmployeeRegisterEntity;
import com.epmet.service.IcEmployeeRegisterDetailService;
import com.epmet.service.IcEmployeeRegisterService; import com.epmet.service.IcEmployeeRegisterService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -29,6 +31,9 @@ import java.util.Map;
@Service @Service
public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeRegisterDao, IcEmployeeRegisterEntity> implements IcEmployeeRegisterService { public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeRegisterDao, IcEmployeeRegisterEntity> implements IcEmployeeRegisterService {
@Autowired
private IcEmployeeRegisterDetailService icEmployeeRegisterDetailService;
@Override @Override
public PageData<IcEmployeeRegisterDTO> page(Map<String, Object> params) { public PageData<IcEmployeeRegisterDTO> page(Map<String, Object> params) {
IPage<IcEmployeeRegisterEntity> page = baseDao.selectPage( IPage<IcEmployeeRegisterEntity> page = baseDao.selectPage(
@ -64,8 +69,10 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeReg
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void save(IcEmployeeRegisterDTO dto) { public void save(IcEmployeeRegisterDTO dto) {
IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class); IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class);
insert(entity); insert(entity);
IcEmployeeRegisterDetailEntity detailEntity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterDetailEntity.class);
detailEntity.setRegisterId(entity.getId());
icEmployeeRegisterDetailService.insert(detailEntity);
} }
@Override @Override

Loading…
Cancel
Save