Commit 7a109f4f authored by 韩桐桐's avatar 韩桐桐

fix(jg):车用气瓶添加投用日期

parent 0bcad106
...@@ -257,4 +257,7 @@ public class JgVehicleInformationDto extends BaseDto { ...@@ -257,4 +257,7 @@ public class JgVehicleInformationDto extends BaseDto {
@ApiModelProperty("使用登记表附件") @ApiModelProperty("使用登记表附件")
private String useRegistrationFormFile; private String useRegistrationFormFile;
@ApiModelProperty("投入使用日期")
private String useDate;
} }
...@@ -441,4 +441,10 @@ public class JgVehicleInformation extends BaseEntity { ...@@ -441,4 +441,10 @@ public class JgVehicleInformation extends BaseEntity {
*/ */
@TableField("use_registration_form_file") @TableField("use_registration_form_file")
private String useRegistrationFormFile; private String useRegistrationFormFile;
/**
* 投入使用日期
*/
@TableField("use_date")
private String useDate;
} }
...@@ -278,4 +278,7 @@ public class JgVehicleInformationVo implements Serializable { ...@@ -278,4 +278,7 @@ public class JgVehicleInformationVo implements Serializable {
@ApiModelProperty(value = "创建人名称") @ApiModelProperty(value = "创建人名称")
private String createUserName; private String createUserName;
@ApiModelProperty(value = "投用日期")
private String useDate;
} }
...@@ -344,6 +344,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -344,6 +344,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
BeanUtils.copyProperties(vehicleInfoDto, vehicleInformation); BeanUtils.copyProperties(vehicleInfoDto, vehicleInformation);
vehicleInformation.setCreateUserId(reginParams.getUserModel().getUserId()); vehicleInformation.setCreateUserId(reginParams.getUserModel().getUserId());
vehicleInformation.setRegDate(new Date()); vehicleInformation.setRegDate(new Date());
vehicleInformation.setUseDate(Optional.ofNullable(String.valueOf(map.get("useDate"))).orElse(""));
vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName()); vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
vehicleInformation.setGasNum(equipmentLists.size()); vehicleInformation.setGasNum(equipmentLists.size());
BigDecimal totalVolume = equipmentLists.stream() BigDecimal totalVolume = equipmentLists.stream()
...@@ -1057,7 +1058,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -1057,7 +1058,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
useInfo.setProvince("610000"); useInfo.setProvince("610000");
useInfo.setIsIntoManagement(Boolean.TRUE); useInfo.setIsIntoManagement(Boolean.TRUE);
useInfo.setAddress(jgVehicleInformation.getUseUnitAddress()); useInfo.setAddress(jgVehicleInformation.getUseUnitAddress());
useInfo.setUseDate(String.valueOf(map.get("useDate"))); useInfo.setUseDate(jgVehicleInformation.getUseDate());
LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda(); LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
lambda.eq(IdxBizJgUseInfo::getRecord, map.get("record")); lambda.eq(IdxBizJgUseInfo::getRecord, map.get("record"));
......
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