Browse Source

detail

master
zxc 3 years ago
parent
commit
11eebc55c8
  1. 3
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java
  2. 81
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java
  3. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java
  4. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java

3
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java

@ -1,5 +1,6 @@
package com.epmet.dto;
import com.epmet.dto.form.dataSync.ResiInfoDTO;
import lombok.Data;
import java.io.Serializable;
@ -143,4 +144,6 @@ public class DataSyncRecordDisabilityDTO implements Serializable {
*/
private Date updatedTime;
private ResiInfoDTO resiInfo;
}

81
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java

@ -0,0 +1,81 @@
package com.epmet.dto.form.dataSync;
import lombok.Data;
import java.io.Serializable;
/**
* @Author zxc
* @DateTime 2022/10/13 15:58
* @DESC
*/
@Data
public class ResiInfoDTO implements Serializable {
private static final long serialVersionUID = -3320460795150912451L;
/**
* 姓名
*/
private String name;
/**
* 身份证
*/
private String idCard;
/**
* 电话
*/
private String mobile;
/**
* 残疾证号
*/
private String cardNum;
/**
* 残疾等级(状况)
*/
private String cjzk;
/**
* 残疾类别
*/
private String cjlb;
/**
* 民族
*/
private String mz;
/**
* 家庭住址
*/
private String address;
/**
* 性别
*/
private String gender;
/**
* 监护人
*/
private String guardian;
public ResiInfoDTO() {
this.name = "";
this.idCard = "";
this.mobile = "";
this.cardNum = "";
this.cjzk = "";
this.cjlb = "";
this.mz = "";
this.address = "";
this.gender = "";
this.guardian = "";
}
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDisabilityController.java

@ -42,7 +42,7 @@ public class DataSyncRecordDisabilityController {
return new Result<PageData<DataSyncRecordDisabilityDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
@PostMapping("detail/{id}")
public Result<DataSyncRecordDisabilityDTO> get(@PathVariable("id") String id){
DataSyncRecordDisabilityDTO data = dataSyncRecordDisabilityService.get(id);
return new Result<DataSyncRecordDisabilityDTO>().ok(data);

13
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java

@ -22,15 +22,19 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
import com.epmet.dao.DataSyncRecordDisabilityDao;
import com.epmet.dto.DataSyncRecordDisabilityDTO;
import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.form.dataSync.DataSyncRecordDisabilityFormDTO;
import com.epmet.dto.form.dataSync.ResiInfoDTO;
import com.epmet.entity.DataSyncRecordDisabilityEntity;
import com.epmet.excel.DataSyncRecordDisabilityExcel;
import com.epmet.service.DataSyncRecordDisabilityService;
import com.epmet.service.IcResiUserService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -49,6 +53,9 @@ import java.util.*;
@Slf4j
public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyncRecordDisabilityDao, DataSyncRecordDisabilityEntity> implements DataSyncRecordDisabilityService {
@Autowired
private IcResiUserService icResiUserService;
@Override
public PageData<DataSyncRecordDisabilityDTO> page(Map<String, Object> params) {
IPage<DataSyncRecordDisabilityEntity> page = baseDao.selectPage(
@ -77,7 +84,11 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
@Override
public DataSyncRecordDisabilityDTO get(String id) {
DataSyncRecordDisabilityEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class);
DataSyncRecordDisabilityDTO result = ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class);
IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
result.setResiInfo(resiInfoDTO);
return result;
}
@Override

Loading…
Cancel
Save