Merge branch 'refs/heads/develop_tzs_register_0621' into develop_tzs_register

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

@@ -16,7 +16,7 @@
                 and  tjvi.car_number like concat('%',#{dto.carNumber},'%')
             </if>
             <if test="dto.regDate != null and dto.regDate != ''">
-                and tjvi.reg_date like concat('%',DATE_FORMAT(#{dto.reg_date},'%Y-%m-%d'),'%')
+                and tjvi.reg_date like concat('%',DATE_FORMAT(#{dto.regDate},'%Y-%m-%d'),'%')
             </if>
             <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
                 and tjvi.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')

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

@@ -283,6 +283,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         JgVehicleInformation vehicleInformation = new JgVehicleInformation();
         BeanUtils.copyProperties(vehicleInfoDto, vehicleInformation);
         vehicleInformation.setCreateUserId(reginParams.getUserModel().getUserId());
+        vehicleInformation.setRegDate(new Date());
         vehicleInformation.setCreateUserName(reginParams.getUserModel().getRealName());
         vehicleInformation.setGasNum(equipmentLists.size());
         vehicleInformation.setVolume(String.valueOf(equipmentLists.stream()

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

@@ -192,4 +192,12 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
     @TableField("\"LAST_USE_CERT_FILE_PATH\"")
     private String lastUseCertFilePath;
 
+    /**
+     * 是否球罐
+     *  1：是
+     *  0：不是
+     */
+    @TableField("\"WHETHER_SPHERICAL_TANK\"")
+    private String whetherSphericalTank;
+
 }