删除无用字段

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyDetailsDto.java

@@ -53,6 +53,12 @@ public class SurveyDetailsDto  extends BaseDto {
     @ApiModelProperty(value = "房屋偏向")
     private String houseBias;
 
+
+    @ApiModelProperty(value = "手机指南正截图")
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> compass;
+
+
     @ApiModelProperty(value = "房屋偏向备注")
     private String houseBiasNotes;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/Commercial.java

@@ -58,7 +58,7 @@ public class Commercial extends BaseEntity {
      * 省市区code
      */
 	@TableField(value = "project_address",typeHandler = FastjsonTypeHandler.class)
-    private List<Object> projectAddress;
+    private List<Integer> projectAddress;
     /**
      * 省市区名称
      */

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/SurveyDetails.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -78,6 +79,12 @@ public class SurveyDetails extends BaseEntity {
 	@TableField("house_bias")
     private String houseBias;
 
+
+    /**
+     * 手机指南正截图
+     */
+    @TableField(value = "compass",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> compass;
     /**
      * 房屋偏向备注
      */

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -347,6 +347,17 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
         commercialQueryWrapper.eq("survey_information_id", surveyInformationId);
         Commercial commercial = commercialService.getBaseMapper().selectOne(commercialQueryWrapper);
+
+        commercial.setApplicant(surveyInfoAllDto.getSurveyInformation().getOwnersName());
+        commercial.setIdCard(surveyInfoAllDto.getSurveyInformation().getIdCard());
+        commercial.setTelephone(surveyInfoAllDto.getSurveyInformation().getTelephone());
+        commercial.setProjectAddress(surveyInfoAllDto.getSurveyInformation().getProjectAddress());
+        commercial.setProjectAddressName(surveyInfoAllDto.getSurveyInformation().getProjectAddressName());
+        commercial.setProjectAddressDetail(surveyInfoAllDto.getSurveyInformation().getProjectAddressDetail());
+        commercial.setLegalContactTelephone(surveyInfoAllDto.getSurveyInformation().getTelephone());
+
+
+
         if(information == null){
             CommercialDto commercialDto = new CommercialDto();
             commercialDto.setType("zrr");