1.历史的使用登记、车用气瓶登记增加原登记机关、原登记日期

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

@@ -12,13 +12,11 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2024-03-18
  */
 @Data
-@ApiModel(value="JgVehicleInformationVo", description="")
+@ApiModel(value = "JgVehicleInformationVo", description = "")
 public class JgVehicleInformationVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -253,5 +251,13 @@ public class JgVehicleInformationVo implements Serializable {
     @ApiModelProperty(value = "历史设备-原使用登记证附件")
     private List<?> oldUseRegistrationCertificate;
 
+
+    @ApiModelProperty(value = "历史设备-原登记机关")
+    private String oRegUnit;
+
+
+    @ApiModelProperty(value = "历史设备-原登记日期")
+    private String oRegDate;
+
     private CompanyBo companyInfo;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -2851,6 +2851,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 useInfo.setUsePlace((String) map.get("usePlace"));
                 useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
                 useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
+                useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
+                useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
                 // 历史平台登记，将设备状态改为在用
                 useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
                 String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + "/" + useInfo.getStreetName();
@@ -3182,6 +3184,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
             useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
             useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
+            useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
+            useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
             useInfoMapper.update(useInfo, lambda);
 
             // 更新检验检测信息【一对多，暂时只取最新一条数据】

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -649,7 +649,10 @@ 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);
             IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
+            vo.setORegDate(useInfo.getORegDate());
+            vo.setORegUnit(useInfo.getORegUnit());
             vo.setOldUseRegistrationTable(JSONArray.parseArray(useInfo.getOldUseRegistrationTable()));
             vo.setOldUseRegistrationCertificate(JSONArray.parseArray(useInfo.getOldUseRegistrationCertificate()));
         }
@@ -1902,6 +1905,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(useInfoLambdaQueryWrapper);
                 useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
                 useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
+                useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
+                useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
                 useInfoMapper.updateById(useInfo);
 
                 // 更新注册登记信息表
@@ -2095,6 +2100,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(useInfoLambdaQueryWrapper);
                 useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
                 useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
+                useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
+                useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
                 useInfoMapper.updateById(useInfo);
 
                 // 更新注册登记信息表

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -259,4 +259,18 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
     @TableField("\"OLD_USE_REGISTRATION_TABLE\"")
     private String oldUseRegistrationTable;
 
+
+    /**
+     * 历史设备-原登记机关
+     */
+    @TableField("\"O_REG_UNIT\"")
+    private String oRegUnit;
+
+
+    /**
+     * 历史设备-原登记日期
+     */
+    @TableField("\"O_REG_DATE\"")
+    private String oRegDate;
+
 }