Browse Source

行程上报

origin/epidemic_user
Jackwang 4 years ago
parent
commit
1ec76759f9
  1. 2
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java
  2. 2
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java
  3. 4
      epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java
  4. 2
      epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml

2
epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/TripReportEntity.java

@ -66,7 +66,7 @@ public class TripReportEntity extends BaseEpdcEntity {
/** /**
* 现居住详细地址 * 现居住详细地址
*/ */
private String nowAddressDaetail; private String nowAddressDetail;
/** /**
* 来自地区编码 * 来自地区编码

2
epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/TripReportExcel.java

@ -50,7 +50,7 @@ public class TripReportExcel {
private String nowAddressName; private String nowAddressName;
@Excel(name = "现居住详细地址") @Excel(name = "现居住详细地址")
private String nowAddressDaetail; private String nowAddressDetail;
@Excel(name = "来自地区编码") @Excel(name = "来自地区编码")
private String comeAddressCode; private String comeAddressCode;

4
epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/TripReportServiceImpl.java

@ -110,6 +110,7 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
@Override @Override
public Result saveTripInfo(SaveTripInfoFormDTO formDto) { public Result saveTripInfo(SaveTripInfoFormDTO formDto) {
log.info("formDto:"+formDto);
TripReportEntity entity = ConvertUtils.sourceToTarget(formDto, TripReportEntity.class); TripReportEntity entity = ConvertUtils.sourceToTarget(formDto, TripReportEntity.class);
insert(entity); insert(entity);
return new Result().ok("操作成功!"); return new Result().ok("操作成功!");
@ -117,6 +118,7 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
@Override @Override
public Result getTripInfoList(GetTripInfoFormDTO formDto) { public Result getTripInfoList(GetTripInfoFormDTO formDto) {
log.info("formDto:"+formDto);
int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
formDto.setPageIndex(pageIndex); formDto.setPageIndex(pageIndex);
List<TripListDTO> result = baseDao.getTripInfoList(formDto); List<TripListDTO> result = baseDao.getTripInfoList(formDto);
@ -125,12 +127,14 @@ public class TripReportServiceImpl extends BaseServiceImpl<TripReportDao, TripRe
@Override @Override
public Result getTripInfoDetail(GetTripInfoFormDTO formDto) { public Result getTripInfoDetail(GetTripInfoFormDTO formDto) {
log.info("formDto:"+formDto);
TripReportEntity entity = selectById(formDto.getId()); TripReportEntity entity = selectById(formDto.getId());
return new Result().ok(entity); return new Result().ok(entity);
} }
@Override @Override
public Result deleteTripById(GetTripInfoFormDTO formDto) { public Result deleteTripById(GetTripInfoFormDTO formDto) {
log.info("formDto:"+formDto);
Boolean result = deleteById(formDto.getId()); Boolean result = deleteById(formDto.getId());
if(result){ if(result){
return new Result().ok("操作成功!"); return new Result().ok("操作成功!");

2
epdc-cloud-custom/src/main/resources/mapper/epidemic/TripReportDao.xml

@ -10,7 +10,7 @@
<result property="idCard" column="ID_CARD"/> <result property="idCard" column="ID_CARD"/>
<result property="nowAddressCode" column="NOW_ADDRESS_CODE"/> <result property="nowAddressCode" column="NOW_ADDRESS_CODE"/>
<result property="nowAddressName" column="NOW_ADDRESS_NAME"/> <result property="nowAddressName" column="NOW_ADDRESS_NAME"/>
<result property="nowAddressDaetail" column="NOW_ADDRESS_DAETAIL"/> <result property="nowAddressDetail" column="NOW_ADDRESS_DETAIL"/>
<result property="comeAddressCode" column="COME_ADDRESS_CODE"/> <result property="comeAddressCode" column="COME_ADDRESS_CODE"/>
<result property="comeAddressName" column="COME_ADDRESS_NAME"/> <result property="comeAddressName" column="COME_ADDRESS_NAME"/>
<result property="comeDate" column="COME_DATE"/> <result property="comeDate" column="COME_DATE"/>

Loading…
Cancel
Save