fix(jg):添加历史设备的使用登记证/表附件

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -15,6 +15,9 @@
             <if test="dto.carNumber != null and dto.carNumber != ''">
                 and  tjvi.car_number like concat('%',#{dto.carNumber},'%')
             </if>
+            <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
+                and  tjvi.use_registration_code like concat('%',#{dto.useRegistrationCode},'%')
+            </if>
             <if test="dto.regDate != null and dto.regDate != ''">
                 and tjvi.reg_date like concat('%',DATE_FORMAT(#{dto.regDate},'%Y-%m-%d'),'%')
             </if>

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/CommonServiceImpl.java

@@ -911,6 +911,7 @@ public class CommonServiceImpl implements ICommonService {
         map.put("giveOutDay", Optional.ofNullable(map.get("giveOutDay")).orElse("").toString());  // 发证日期-日
         map.put("excelType", Optional.ofNullable(map.get("excelType")).orElse("使用登记").toString());  // 发证日期-日
         map.put("tableName", Optional.ofNullable(map.get("tableName")).orElse("特种设备使用登记证").toString());  // 发证日期-日
+        map.put("carNumber", Optional.ofNullable(map.get("carNumber")).orElse("").toString());  // 车牌号
         // 生成二维码,之前为设备监管码，调整为申请单号
         String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("applyNo")).orElse("").toString(), 100, 100);
         map.put("supervisoryCode", qrCode);  // 监管二维码

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

@@ -2855,6 +2855,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 useInfo.setUseDate(String.valueOf(map.get("useDate")));
                 useInfo.setLongitudeLatitude(JSON.toJSONString(map.get("longitudeLatitude")));
                 useInfo.setUsePlace((String) map.get("usePlace"));
+                useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
+                useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
                 // 历史平台登记，将设备状态改为在用
                 useInfo.setEquState(EquimentEnum.ZAIYONG.getCode().toString());
                 String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + "/" + useInfo.getStreetName();

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

@@ -1885,6 +1885,14 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(queryRegisterWrapper);
                 registerInfo.setUseOrgCode(vehicleInformation.getUseRegistrationCode());
 
+                // 更新使用信息
+                LambdaQueryWrapper<IdxBizJgUseInfo> useInfoLambdaQueryWrapper = new QueryWrapper<IdxBizJgUseInfo>().lambda();
+                useInfoLambdaQueryWrapper.eq(IdxBizJgUseInfo::getRecord, String.valueOf(x.get("record")));
+                IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(useInfoLambdaQueryWrapper);
+                useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
+                useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
+                useInfoMapper.updateById(useInfo);
+
                 // 更新注册登记信息表
                 LambdaUpdateWrapper<IdxBizJgRegisterInfo> updateRegisterWrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda();
                 // 新增页面选择无设备代码后，在审批通过后自动生成设备代码

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgUseInfoDto.java

@@ -132,4 +132,14 @@ public class IdxBizJgUseInfoDto  extends BaseDto {
     @TableField("IS_NOT_ELEV")
     private String isNotElev;
 
+
+    @ApiModelProperty(value = "历史设备-原使用登记证附件")
+    @TableField("\"OLD_USE_REGISTRATION_CERTIFICATE\"")
+    private String oldUseRegistrationCertificate;
+
+
+    @ApiModelProperty(value = "历史设备-原使用登记表附件")
+    @TableField("\"OLD_USE_REGISTRATION_TABLE\"")
+    private String oldUseRegistrationTable;
+
 }

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

@@ -245,4 +245,18 @@ public class IdxBizJgUseInfo extends TzsBaseEntity {
     @TableField("\"PROJECT_CONTRAPTION\"")
     private String projectContraption;
 
+
+    /**
+     * 历史设备-原使用登记证附件
+     */
+    @TableField("\"OLD_USE_REGISTRATION_CERTIFICATE\"")
+    private String oldUseRegistrationCertificate;
+
+
+    /**
+     * 历史设备-原使用登记表附件
+     */
+    @TableField("\"OLD_USE_REGISTRATION_TABLE\"")
+    private String oldUseRegistrationTable;
+
 }