Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

# Conflicts:
#	air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java

air/src/main/java/com/air/housing/dto/HousingDefine.java

@@ -25,6 +25,4 @@ public class HousingDefine {
     private String format;
     @ApiModelProperty(value = "物业类型")
     private String propertyType;
-//    @ApiModelProperty(value = "其他编号")
-//    private String otherNo;
 }

air/src/main/java/com/air/housing/service/impl/HousingEstatesServiceImpl.java

@@ -1,8 +1,6 @@
 package com.air.housing.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.air.housing.entity.Blocks;
-import com.air.housing.entity.Format;
+import com.air.entity.Blocks;
 import com.air.housing.entity.Houses;
 import com.air.housing.dto.HousingDefine;
 import com.air.housing.entity.HousingEstates;
@@ -84,6 +82,18 @@ public class HousingEstatesServiceImpl extends ServiceImpl<HousingEstatesMapper,
         copyBlocksOriginToBlocks(blocksOrigin, housingDefine);
 
         copyHousesOriginToHouses(housingDefine.getBlockId(), housingDefine);
+
+        //查询业态表
+        Format format = formatService.getOne(Wrappers.<Format>query().lambda().eq(Format::getHousingEstateId, housingDefine.getHousingEstatesId())
+                .eq(Format::getLargeFormat, housingDefine.getLargeFormat())
+                .eq(Format::getFormat, housingDefine.getFormat()));
+        if (format == null) {
+            format = new Format();
+            format.setHousingEstateId(housingDefine.getHousingEstatesId());
+            format.setLargeFormat(housingDefine.getLargeFormat());
+            format.setFormat(housingDefine.getFormat());
+            formatService.save(format);
+        }
         return true;
     }
 

air/src/main/java/com/air/origin/dto/BlocksOriginQuery.java

@@ -2,10 +2,15 @@ package com.air.origin.dto;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.air.origin.entity.BlocksOrigin;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 楼栋信息
@@ -29,6 +34,10 @@ public class BlocksOriginQuery {
     private String preSaleLicenseNo;
     @ApiModelProperty(value = "状态")
     private String statusCd;
+    @ApiModelProperty(value = "日期，格式yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDateTime createDate;
 
     public BlocksOrigin blocksOrigin() {
         BlocksOrigin origin = new BlocksOrigin();

air/src/main/java/com/air/origin/entity/BlocksOrigin.java

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -57,6 +59,8 @@ public class BlocksOrigin extends Model<BlocksOrigin> {
     @ApiModelProperty(value = "创建人")
     private String createUserId;
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime createDate;
     @ApiModelProperty(value = "修改人")
     private String updateUserId;
@@ -66,4 +70,6 @@ public class BlocksOrigin extends Model<BlocksOrigin> {
     private String remark;
     @ApiModelProperty(value = "数据id")
     private String dataId;
+    @ApiModelProperty(value = "其他编号")
+    private String otherNo;
 }

air/src/main/resources/mapper/BlocksOriginMapper.xml

@@ -22,5 +22,6 @@
                         <result property="updateDate" column="update_date"/>
                         <result property="remark" column="remark"/>
                         <result property="dataId" column="data_id"/>
+                        <result property="otherNo" column="other_no"/>
             </resultMap>
 </mapper>