Commit 1ccf1a7a authored by suhuiguang's avatar suhuiguang

1.历史的使用登记、车用气瓶登记增加原登记机关、原登记日期,联调自测修改

parent 03c08334
package com.yeejoin.amos.boot.module.jg.api.vo;
import com.alibaba.fastjson.JSONArray;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -253,10 +254,12 @@ public class JgVehicleInformationVo implements Serializable {
@ApiModelProperty(value = "历史设备-原登记机关")
@JsonProperty("oRegUnit")
private String oRegUnit;
@ApiModelProperty(value = "历史设备-原登记日期")
@JsonProperty("oRegDate")
private String oRegDate;
private CompanyBo companyInfo;
......
......@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
......@@ -649,7 +650,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
if (firstEqu.isPresent()) {
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, firstEqu.get().get("record"));
lambda.select(IdxBizJgUseInfo::getOldUseRegistrationCertificate,IdxBizJgUseInfo::getOldUseRegistrationTable,IdxBizJgUseInfo::getORegDate,IdxBizJgUseInfo::getORegUnit);
lambda.select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getOldUseRegistrationCertificate,IdxBizJgUseInfo::getOldUseRegistrationTable,IdxBizJgUseInfo::getORegDate,IdxBizJgUseInfo::getORegUnit);
IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
vo.setORegDate(useInfo.getORegDate());
vo.setORegUnit(useInfo.getORegUnit());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment