站点勘察功能接口联调

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
+import java.util.List;
 
 /**
  * 商务信息
@@ -34,7 +36,8 @@ public class CommercialDto  extends BaseDto {
     private String telephone;
 
     @ApiModelProperty(value = "省市区")
-    private String projectAddress;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Integer> projectAddress;
 
     @ApiModelProperty(value = "设备信息")
     private String device;
@@ -55,52 +58,68 @@ public class CommercialDto  extends BaseDto {
     private String legalEmergentTelephone;
 
     @ApiModelProperty(value = "结婚证文件标识")
-    private String marriageCredit;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> marriageCredit;
 
     @ApiModelProperty(value = "房产证文件标识")
-    private String realEstateCredit;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> realEstateCredit;
 
     @ApiModelProperty(value = "身份证正反面文件标识")
-    private String idCardCredit;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> idCardCredit;
 
     @ApiModelProperty(value = "户口本文件标识")
-    private String householdBookCredit;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> householdBookCredit;
 
     @ApiModelProperty(value = "手持身份证文件标识")
-    private String handIdCardCredit;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> handIdCardCredit;
 
     @ApiModelProperty(value = "踏勘照片文件标识")
-    private String surveyPhotosWeb;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> surveyPhotosWeb;
 
     @ApiModelProperty(value = "组件平面图与组串连线图文件标识")
-    private String formationWeb;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> formationWeb;
 
     @ApiModelProperty(value = "房屋所有权继承说明文件标识")
-    private String inheritWeb;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> inheritWeb;
 
     @ApiModelProperty(value = "户用光伏电站项目合作协议文件标识")
-    private String agreementWeb;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> agreementWeb;
 
     @ApiModelProperty(value = "用户手持身份证照片文件标识")
-    private String handIdCardLegal;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> handIdCardLegal;
 
     @ApiModelProperty(value = "法人营业执照文件标识")
-    private String licenseLegal;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> licenseLegal;
 
     @ApiModelProperty(value = "法定代理人身份证文件标识")
-    private String agentLegal;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> agentLegal;
 
     @ApiModelProperty(value = "房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识")
-    private String realEstateLegal;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> realEstateLegal;
 
     @ApiModelProperty(value = "房屋屋顶租赁协议/户用光伏共建开发协议文件标识")
-    private String houseAgreementLegal;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> houseAgreementLegal;
 
     @ApiModelProperty(value = "法人的企业征信报告、工商内档文件标识")
-    private String creditReportLegal;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> creditReportLegal;
 
     @ApiModelProperty(value = "项目备案证文件标识")
-    private String filingsLegal;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> filingsLegal;
 
     @ApiModelProperty(value = " 省市区详细地址")
     private String projectAddressDetail;

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
+import java.util.List;
 
 /**
  * 扩展信息
@@ -25,7 +27,8 @@ public class ExtendedInformationDto  extends BaseDto {
     private String orderDescription;
 
     @ApiModelProperty(value = "联系人")
-    private String contacts;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> contacts;
 
     @ApiModelProperty(value = "勘察表id")
     private Long surveyInformationId;

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 资料归档
@@ -28,10 +31,12 @@ public class InformationDto  extends BaseDto {
     private String archivesNumber;
 
     @ApiModelProperty(value = "身份证文件标识")
-    private String cardFile;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> cardFile;
 
     @ApiModelProperty(value = " 房产证文件标识")
-    private String houseProve;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> houseProve;
 
     @ApiModelProperty(value = "勘察表id")
     private Long surveyInformationId;

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -50,19 +52,17 @@ public class PeasantHouseholdDto  extends BaseDto {
     private Date creationTime;
 
     @ApiModelProperty(value = "项目地址")
-    private String projectAddress;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Integer> projectAddress;
 
-    @ApiModelProperty(value = "项目地址Arr")
-    private List<Integer> projectAddressArr;
 
     @ApiModelProperty(value = "常住是否相同")
+    @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<String> isPermanent;
 
     @ApiModelProperty(value = "常住地址")
-    private String permanentAddress;
-
-    @ApiModelProperty(value = "常住地址Arr")
-    private List<Integer> permanentAddressArr;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Integer> permanentAddress;
 
     @ApiModelProperty(value = "是否勘察 0,1")
     private Integer surveyOrNot;

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 勘察明细
@@ -23,11 +27,13 @@ public class SurveyDetailsDto  extends BaseDto {
     @ApiModelProperty(value = "勘察表id")
     private Long surveyInformationId;
 
+    @JsonFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "勘察时间")
     private Date surveyorTime;
 
     @ApiModelProperty(value = "房屋类型")
-    private String houseType;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<String> houseType;
 
     @ApiModelProperty(value = "房屋整体情况")
     private String houseSituation;
@@ -45,7 +51,7 @@ public class SurveyDetailsDto  extends BaseDto {
     private Integer houseHeight;
 
     @ApiModelProperty(value = "房屋偏向")
-    private Integer houseBias;
+    private String houseBias;
 
     @ApiModelProperty(value = "房屋偏向备注")
     private String houseBiasNotes;
@@ -63,25 +69,29 @@ public class SurveyDetailsDto  extends BaseDto {
     private String locationAlt;
 
     @ApiModelProperty(value = "屋顶通道")
-    private String roofway;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<String> roofway;
 
     @ApiModelProperty(value = "屋顶通道备注")
     private String roofwayNotes;
 
     @ApiModelProperty(value = "周边障碍物")
-    private String obstacle;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<String> obstacle;
 
     @ApiModelProperty(value = "周边障碍物备注")
     private String obstacleNotes;
 
     @ApiModelProperty(value = "遮挡物")
-    private String screen;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<String> screen;
 
     @ApiModelProperty(value = "遮挡物备注")
     private String screenNotes;
 
     @ApiModelProperty(value = "解决措施")
-    private String solutionMeasures;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private  List<String> solutionMeasures;
 
     @ApiModelProperty(value = "房屋产权")
     private String houseProperty;
@@ -141,27 +151,35 @@ public class SurveyDetailsDto  extends BaseDto {
     private String daylightingObstruction;
 
     @ApiModelProperty(value = "房屋整体文件标识")
-    private String overallHousingSurvey;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> overallHousingSurvey;
 
     @ApiModelProperty(value = "房屋周边文件标识")
-    private String surroundingHouseSurvey;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private  List<Object> surroundingHouseSurvey;
 
     @ApiModelProperty(value = "房屋内部整体照片文件标识")
-    private String insideHouseSurvey;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> insideHouseSurvey;
 
     @ApiModelProperty(value = "电表参数文件标识")
-    private String electricitySurvey;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> electricitySurvey;
 
     @ApiModelProperty(value = "屋顶全貌文件标识")
-    private String panoramaSurvey;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> panoramaSurvey;
 
     @ApiModelProperty(value = "屋顶平面草图文件标识")
-    private String planSketchSurvey;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> planSketchSurvey;
 
     @ApiModelProperty(value = "房屋方位角文件标识")
-    private String azimuthSurvey;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> azimuthSurvey;
 
     @ApiModelProperty(value = "其他附件文件标识")
-    private String otherAccessorySurvey;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<Object> otherAccessorySurvey;
 
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -43,6 +46,7 @@ public class SurveyInformationDto  extends BaseDto {
     @ApiModelProperty(value = "制单人")
     private String creator;
 
+    @JsonFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "制单时间")
     private Date creatorTime;
 
@@ -52,6 +56,9 @@ public class SurveyInformationDto  extends BaseDto {
     @ApiModelProperty(value = " 审核状态 0未审核,1审核中，2审核结束")
     private Integer review;
 
+    @ApiModelProperty(value = "来源农户编号")
+    private String peasantHouseholdNo;
+
     @ApiModelProperty(value = "业主姓名")
     private String ownersName;
 
@@ -71,16 +78,12 @@ public class SurveyInformationDto  extends BaseDto {
     private String permanentAddressDetail;
 
     @ApiModelProperty(value = "项目地址")
-    private String projectAddress;
+   @TableField(typeHandler = FastjsonTypeHandler.class)
+   private List<Integer> projectAddress;
 
     @ApiModelProperty(value = "常住地址")
-    private String permanentAddress;
-
-    @ApiModelProperty(value = "项目地址Arr")
-    private List<Integer> projectAddressArr;
-
-    @ApiModelProperty(value = "常住地址Arr")
-    private List<Integer> permanentAddressArr;
+   @TableField(typeHandler = FastjsonTypeHandler.class)
+   private List<Integer> permanentAddress;
 
     @ApiModelProperty(value = "常住是否相同")
     private List<String> isPermanent;

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 商务信息
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_commercial")
+@TableName(value = "hygf_commercial",autoResultMap = true)
 public class Commercial extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -55,8 +57,8 @@ public class Commercial extends BaseEntity {
     /**
      * 省市区
      */
-	@TableField("project_address")
-    private String projectAddress;
+	@TableField(value = "project_address",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> projectAddress;
 
     /**
      * 设备信息
@@ -97,98 +99,98 @@ public class Commercial extends BaseEntity {
     /**
      * 结婚证文件标识
      */
-	@TableField("marriage_credit")
-    private String marriageCredit;
+	@TableField(value = "marriage_credit",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> marriageCredit;
 
     /**
      * 房产证文件标识
      */
-	@TableField("real_estate_credit")
-    private String realEstateCredit;
+	@TableField(value = "real_estate_credit",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> realEstateCredit;
 
     /**
      * 身份证正反面文件标识
      */
-	@TableField("id_card_credit")
-    private String idCardCredit;
+	@TableField(value = "id_card_credit",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> idCardCredit;
 
     /**
      * 户口本文件标识
      */
-	@TableField("household_book_credit")
-    private String householdBookCredit;
+	@TableField(value = "household_book_credit",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> householdBookCredit;
 
     /**
      * 手持身份证文件标识
      */
-	@TableField("hand_id_card_credit")
-    private String handIdCardCredit;
+	@TableField(value = "hand_id_card_credit",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> handIdCardCredit;
 
     /**
      * 踏勘照片文件标识
      */
-	@TableField("survey_photos_web")
-    private String surveyPhotosWeb;
+	@TableField(value = "survey_photos_web",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> surveyPhotosWeb;
 
     /**
      * 组件平面图与组串连线图文件标识
      */
-	@TableField("formation_web")
-    private String formationWeb;
+	@TableField(value = "formation_web",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> formationWeb;
 
     /**
      * 房屋所有权继承说明文件标识
      */
-	@TableField("inherit_web")
-    private String inheritWeb;
+	@TableField(value = "inherit_web",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> inheritWeb;
 
     /**
      * 户用光伏电站项目合作协议文件标识
      */
-	@TableField("agreement_web")
-    private String agreementWeb;
+	@TableField(value = "agreement_web",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> agreementWeb;
 
     /**
      * 用户手持身份证照片文件标识
      */
-	@TableField("hand_id_card_legal")
-    private String handIdCardLegal;
+	@TableField(value = "hand_id_card_legal",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> handIdCardLegal;
 
     /**
      * 法人营业执照文件标识
      */
-	@TableField("license_legal")
-    private String licenseLegal;
+	@TableField(value = "license_legal",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> licenseLegal;
 
     /**
      * 法定代理人身份证文件标识
      */
-	@TableField("agent_legal")
-    private String agentLegal;
+	@TableField(value = "agent_legal",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> agentLegal;
 
     /**
      * 房产证明文件或乡镇街道土管部门房屋产权证明文件文件标识
      */
-	@TableField("real_estate_legal")
-    private String realEstateLegal;
+	@TableField(value = "real_estate_legal",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> realEstateLegal;
 
     /**
      * 房屋屋顶租赁协议/户用光伏共建开发协议文件标识
      */
-	@TableField("house_agreement_legal")
-    private String houseAgreementLegal;
+	@TableField(value = "house_agreement_legal",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> houseAgreementLegal;
 
     /**
      * 法人的企业征信报告、工商内档文件标识
      */
-	@TableField("credit_report_legal")
-    private String creditReportLegal;
+	@TableField(value = "credit_report_legal",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> creditReportLegal;
 
     /**
      * 项目备案证文件标识
      */
-	@TableField("filings_legal")
-    private String filingsLegal;
+	@TableField(value = "filings_legal",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> filingsLegal;
 
     /**
      *  省市区详细地址

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 扩展信息
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_extended_information")
+@TableName(value = "hygf_extended_information",autoResultMap = true)
 public class ExtendedInformation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -31,8 +33,8 @@ public class ExtendedInformation extends BaseEntity {
     /**
      * 联系人
      */
-	@TableField("contacts")
-    private String contacts;
+	@TableField(value = "contacts",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> contacts;
 
     /**
      * 勘察表id

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 资料归档
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_information")
+@TableName(value = "hygf_information",autoResultMap = true)
 public class Information extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -37,14 +39,14 @@ public class Information extends BaseEntity {
     /**
      * 身份证文件标识
      */
-	@TableField("card_file")
-    private String cardFile;
+	@TableField(value = "card_file",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> cardFile;
 
     /**
      *  房产证文件标识
      */
-	@TableField("house_prove")
-    private String houseProve;
+	@TableField(value = "house_prove",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> houseProve;
 
     /**
      * 勘察表id

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 农户信息
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_peasant_household")
+@TableName(value = "hygf_peasant_household",autoResultMap = true)
 public class PeasantHousehold extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -73,14 +75,14 @@ public class PeasantHousehold extends BaseEntity {
     /**
      * 项目地址
      */
-	@TableField("project_address")
-    private String projectAddress;
+	@TableField(value = "project_address",typeHandler = FastjsonTypeHandler.class)
+    private List<Integer> projectAddress;
 
     /**
      * 常住地址
      */
-	@TableField("permanent_address")
-    private String permanentAddress;
+	@TableField(value = "permanent_address",typeHandler = FastjsonTypeHandler.class)
+    private List<Integer> permanentAddress;
 
     /**
      * 常住地址

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 勘察明细
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_survey_details")
+@TableName(value = "hygf_survey_details",autoResultMap = true)
 public class SurveyDetails extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -37,8 +39,8 @@ public class SurveyDetails extends BaseEntity {
     /**
      * 房屋类型
      */
-	@TableField("house_type")
-    private String houseType;
+	@TableField(value = "house_type",typeHandler = FastjsonTypeHandler.class)
+    private List<String> houseType;
 
     /**
      * 房屋整体情况
@@ -74,7 +76,7 @@ public class SurveyDetails extends BaseEntity {
      * 房屋偏向
      */
 	@TableField("house_bias")
-    private Integer houseBias;
+    private String houseBias;
 
     /**
      * 房屋偏向备注
@@ -109,8 +111,8 @@ public class SurveyDetails extends BaseEntity {
     /**
      * 屋顶通道
      */
-	@TableField("roofway")
-    private String roofway;
+	@TableField(value = "roofway",typeHandler = FastjsonTypeHandler.class)
+    private List<String> roofway;
 
     /**
      * 屋顶通道备注
@@ -121,8 +123,8 @@ public class SurveyDetails extends BaseEntity {
     /**
      * 周边障碍物
      */
-	@TableField("obstacle")
-    private String obstacle;
+	@TableField(value = "obstacle",typeHandler = FastjsonTypeHandler.class)
+    private List<String> obstacle;
 
     /**
      * 周边障碍物备注
@@ -133,8 +135,8 @@ public class SurveyDetails extends BaseEntity {
     /**
      * 遮挡物
      */
-	@TableField("screen")
-    private String screen;
+	@TableField(value = "screen",typeHandler = FastjsonTypeHandler.class)
+    private List<String> screen;
 
     /**
      * 遮挡物备注
@@ -145,8 +147,8 @@ public class SurveyDetails extends BaseEntity {
     /**
      * 解决措施
      */
-	@TableField("solution_measures")
-    private String solutionMeasures;
+	@TableField(value = "solution_measures",typeHandler = FastjsonTypeHandler.class)
+    private  List<String> solutionMeasures;
 
     /**
      * 房屋产权
@@ -265,49 +267,49 @@ public class SurveyDetails extends BaseEntity {
     /**
      * 房屋整体文件标识
      */
-	@TableField("overall_housing_survey")
-    private String overallHousingSurvey;
+	@TableField(value = "overall_housing_survey",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> overallHousingSurvey;
 
     /**
      * 房屋周边文件标识
      */
-	@TableField("surrounding_house_survey")
-    private String surroundingHouseSurvey;
+	@TableField(value = "surrounding_house_survey",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> surroundingHouseSurvey;
 
     /**
      * 房屋内部整体照片文件标识
      */
-	@TableField("inside_house_survey")
-    private String insideHouseSurvey;
+	@TableField(value = "inside_house_survey",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> insideHouseSurvey;
 
     /**
      * 电表参数文件标识
      */
-	@TableField("electricity_survey")
-    private String electricitySurvey;
+	@TableField(value = "electricity_survey",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> electricitySurvey;
 
     /**
      * 屋顶全貌文件标识
      */
-	@TableField("panorama_survey")
-    private String panoramaSurvey;
+	@TableField(value = "panorama_survey",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> panoramaSurvey;
 
     /**
      * 屋顶平面草图文件标识
      */
-	@TableField("plan_sketch_survey")
-    private String planSketchSurvey;
+	@TableField(value = "plan_sketch_survey",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> planSketchSurvey;
 
     /**
      * 房屋方位角文件标识
      */
-	@TableField("azimuth_survey")
-    private String azimuthSurvey;
+	@TableField(value = "azimuth_survey",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> azimuthSurvey;
 
     /**
      * 其他附件文件标识
      */
-	@TableField("other_accessory_survey")
-    private String otherAccessorySurvey;
+	@TableField(value = "other_accessory_survey",typeHandler = FastjsonTypeHandler.class)
+    private List<Object> otherAccessorySurvey;
 
 }

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

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_survey_information")
+@TableName(value = "hygf_survey_information",autoResultMap = true)
 public class SurveyInformation extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java

@@ -69,21 +69,15 @@ public class PeasantHouseholdController extends BaseController {
 		List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
 		// 处理地址
 		String area = "";
-		for (Integer reg : model.getProjectAddressArr())
+		for (Integer reg : model.getProjectAddress())
 			for (RegionModel re : list) {
 				if (re.getRegionCode().equals(Integer.valueOf(reg))) {
 					area = area + re.getRegionName() + "/";
 				}
 		}
 		model.setProjectAddressName(area.substring(0, area.length() - 2));
-		if (model.getProjectAddressArr().size()>0) {
-			model.setProjectAddress(JSON.toJSONString(model.getProjectAddressArr()));
-		}
-		if (model.getPermanentAddressArr().size()>0) {
-			model.setPermanentAddress(JSON.toJSONString(model.getPermanentAddressArr()));
-		}
 		if (model.getIsPermanent().size()>0) {
-			model.setPermanentAddress(JSON.toJSONString(model.getProjectAddressArr()));
+			model.setPermanentAddress(model.getProjectAddress());
 			model.setPermanentAddressDetail(model.getProjectAddressDetail());
 		}
 		model.setSurveyInformationId(surveyInformationDto.getSequenceNbr());
@@ -106,21 +100,15 @@ public class PeasantHouseholdController extends BaseController {
 		List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
 		// 处理地址
 		String area = "";
-		for (Integer reg : model.getProjectAddressArr())
+		for (Integer reg : model.getProjectAddress())
 			for (RegionModel re : list) {
 				if (re.getRegionCode().equals(Integer.valueOf(reg))) {
 					area = area + re.getRegionName() + "/";
 				}
 			}
 		model.setProjectAddressName(area.substring(0, area.length() - 2));
-		if (model.getProjectAddressArr().size()>0) {
-			model.setProjectAddress(JSON.toJSONString(model.getProjectAddressArr()));
-		}
-		if (model.getPermanentAddressArr().size()>0) {
-			model.setPermanentAddress(JSON.toJSONString(model.getPermanentAddressArr()));
-		}
 		if (model.getIsPermanent().size()>0) {
-			model.setPermanentAddress(JSON.toJSONString(model.getProjectAddressArr()));
+			model.setPermanentAddress(model.getProjectAddress());
 			model.setPermanentAddressDetail(model.getProjectAddressDetail());
 		}
 	    return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.updateWithModel(model));
@@ -150,14 +138,10 @@ public class PeasantHouseholdController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个农户信息",  notes = "根据sequenceNbr查询单个农户信息")
 	public ResponseModel<PeasantHouseholdDto> selectOne(@PathVariable Long sequenceNbr) {
 		PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdServiceImpl.queryBySeq(sequenceNbr);
-		peasantHouseholdDto.setProjectAddressArr(JSON.parseArray(peasantHouseholdDto.getProjectAddress(), Integer.class));
-		if(!StringUtils.isEmpty(peasantHouseholdDto.getPermanentAddress())){
-			peasantHouseholdDto.setPermanentAddressArr(JSON.parseArray(peasantHouseholdDto.getPermanentAddress(), Integer.class));
-		}else {
-			peasantHouseholdDto.setPermanentAddressArr(JSON.parseArray("[]", Integer.class));
+		if(peasantHouseholdDto.getPermanentAddress() ==null){
+			peasantHouseholdDto.setPermanentAddress(JSON.parseArray("[]", Integer.class));
 			peasantHouseholdDto.setIsPermanent(JSON.parseArray("[1]", String.class));
 		}
-
 		return ResponseHelper.buildResponse(peasantHouseholdDto);
 	}
 

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

@@ -74,19 +74,26 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
     public SurveyInfoAllDto saveSurveyInfo(SurveyInfoAllDto surveyInfoAllDto)   {
 
         SurveyInformation surveyInformation = BeanDtoUtils.convert(surveyInfoAllDto.getSurveyInformation(), SurveyInformation.class);
+        surveyInformation.setReview(0);
         this.saveOrUpdate(surveyInformation);
 
-        SurveyDetails surveyDetails = BeanDtoUtils.convert(surveyInfoAllDto.getSurveyDetails(), SurveyDetails.class);
-        surveyDetailsService.save(surveyDetails.setSurveyInformationId(surveyInformation.getSequenceNbr()));
+        ExtendedInformation extendedInformation = BeanDtoUtils.convert(surveyInfoAllDto.getExtendedInformation(), ExtendedInformation.class);
+        extendedInformation.setSurveyInformationId(surveyInformation.getSequenceNbr());
+        extendedInformationService.saveOrUpdate(extendedInformation);
 
-        Information information = BeanDtoUtils.convert(surveyInfoAllDto.getInformation(), Information.class);
-        informationService.save(information.setSurveyInformationId(surveyInformation.getSequenceNbr()));
+        SurveyDetailsDto oldSurveyDetails = surveyInfoAllDto.getSurveyDetails();
+        SurveyDetails surveyDetails = BeanDtoUtils.convert(oldSurveyDetails, SurveyDetails.class);
+        surveyDetails.setSurveyInformationId(surveyInformation.getSequenceNbr());
+        surveyDetailsService.saveOrUpdate(surveyDetails);
 
-        Commercial commercial = BeanDtoUtils.convert(surveyInfoAllDto.getCommercial(), Commercial.class);
-        commercialService.save(commercial.setSurveyInformationId(surveyInformation.getSequenceNbr()));
+        CommercialDto oldCommercial = surveyInfoAllDto.getCommercial();
+        Commercial commercial = BeanDtoUtils.convert(oldCommercial, Commercial.class);
+        commercial.setSurveyInformationId(surveyInformation.getSequenceNbr());
+        commercialService.saveOrUpdate(commercial);
 
-        ExtendedInformation extendedInformation = BeanDtoUtils.convert(surveyInfoAllDto.getExtendedInformation(), ExtendedInformation.class);
-        extendedInformationService.save(extendedInformation.setSurveyInformationId(surveyInformation.getSequenceNbr()));
+        Information information = BeanDtoUtils.convert(surveyInfoAllDto.getInformation(), Information.class);
+        information.setSurveyInformationId(surveyInformation.getSequenceNbr());
+        informationService.saveOrUpdate(information);
 
         return surveyInfoAllDto;
     }
@@ -100,32 +107,16 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         SurveyInformation surveyInformation = this.baseMapper.selectOne(queryWrapper);
         surveyInfoAllDto.setSurveyInformation(BeanDtoUtils.convert(surveyInformation, SurveyInformationDto.class));
 
-
         QueryWrapper<PeasantHousehold> peasantHouseholdQueryWrapper = new QueryWrapper<>();
         peasantHouseholdQueryWrapper.eq("survey_information_id", surveyInformationId);
         PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper().selectOne(peasantHouseholdQueryWrapper);
-
         BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
 
-        surveyInfoAllDto.getSurveyInformation().setProjectAddressArr(JSON.parseArray(peasantHousehold.getProjectAddress(), Integer.class));
-        if(!StringUtils.isEmpty(peasantHousehold.getPermanentAddress())){
-            surveyInfoAllDto.getSurveyInformation().setPermanentAddressArr(JSON.parseArray(peasantHousehold.getPermanentAddress(), Integer.class));
-        }else {
-            surveyInfoAllDto.getSurveyInformation().setPermanentAddressArr(JSON.parseArray("[]", Integer.class));
+        if(peasantHousehold.getPermanentAddress() ==null){
+            surveyInfoAllDto.getSurveyInformation().setPermanentAddress(JSON.parseArray("[]", Integer.class));
             surveyInfoAllDto.getSurveyInformation().setIsPermanent(JSON.parseArray("[1]", String.class));
         }
-
-//        if(StringUtils.isNotEmpty(peasantHousehold.getProjectAddress())) {
-//            String[] pArr = peasantHousehold.getProjectAddress().split(",");
-//            Integer[] convert = (Integer[]) ConvertUtils.convert(pArr, Integer.class);
-//            surveyInfoAllDto.getSurveyInformation().setProjectAddressArr(convert);
-//        }
-//
-//        if(StringUtils.isNotEmpty(peasantHousehold.getPermanentAddress())) {
-//            String[] eArr =  peasantHousehold.getPermanentAddress().split(",");
-//            Integer[] convert1 = (Integer[]) ConvertUtils.convert(eArr, Integer.class);
-//            surveyInfoAllDto.getSurveyInformation().setPermanentAddressArr(convert1);
-//        }
+        surveyInfoAllDto.getSurveyInformation().setSequenceNbr(surveyInformation.getSequenceNbr());
 
         QueryWrapper<SurveyDetails> surveyDetailsQueryWrapper = new QueryWrapper<>();
         surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
@@ -134,19 +125,19 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         surveyInfoAllDto.setSurveyDetails(BeanDtoUtils.convert(surveyDetails, SurveyDetailsDto.class));
 
         QueryWrapper<Information> informationQueryWrapper = new QueryWrapper<>();
-        surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
+        informationQueryWrapper.eq("survey_information_id", surveyInformationId);
         Information information = informationService.getBaseMapper().selectOne(informationQueryWrapper);
 
         surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
 
         QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
-        surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
+        commercialQueryWrapper.eq("survey_information_id", surveyInformationId);
         Commercial commercial = commercialService.getBaseMapper().selectOne(commercialQueryWrapper);
 
         surveyInfoAllDto.setCommercial(BeanDtoUtils.convert(commercial, CommercialDto.class));
 
         QueryWrapper<ExtendedInformation> extendedInformationQueryWrapper = new QueryWrapper<>();
-        surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
+        extendedInformationQueryWrapper.eq("survey_information_id", surveyInformationId);
         ExtendedInformation extendedInformation = extendedInformationService.getBaseMapper().selectOne(extendedInformationQueryWrapper);
 
         surveyInfoAllDto.setExtendedInformation(BeanDtoUtils.convert(extendedInformation, ExtendedInformationDto.class));