修改保存对象

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.CommonFile;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import java.util.List;
 
 /**
  * 户用光伏合同表
@@ -39,13 +41,16 @@ public class HouseholdPvContactDto  extends BaseDto {
     private String description;
 
     @ApiModelProperty(value = "屋顶租赁及使用协议")
-    private String useAgreement;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> useAgreement;
 
     @ApiModelProperty(value = "签约视频")
-    private String signingVideo;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> signingVideo;
 
     @ApiModelProperty(value = "备案证明")
-    private String filingCertificate;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> filingCertificate;
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -3,8 +3,11 @@ package com.yeejoin.amos.boot.module.jxiop.api.dto;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.CommonFile;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -59,16 +62,20 @@ public class HouseholdPvDto extends BaseDto {
 	private String postcode;
 
 	@ApiModelProperty(value = "身份证正面")
-	private String idFrontPhoto;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> idFrontPhoto;
 
 	@ApiModelProperty(value = "身份证背面")
-	private String idBackPhoto;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> idBackPhoto;
 
 	@ApiModelProperty(value = "房屋产权证")
-	private String housePropertyCertificate;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> housePropertyCertificate;
 
 	@ApiModelProperty(value = "农户首页照片")
-	private String homepagePhoto;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> homepagePhoto;
 
 	@ApiModelProperty(value = "送达地址")
 	private String serviceAddress;

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.CommonFile;
+
 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;
 
 /**
  * 户用光伏合同表
@@ -31,19 +37,24 @@ public class HouseholdPvInstallDto  extends BaseDto {
     private String description;
 
     @ApiModelProperty(value = "基础框架整体安装照片")
-    private String foundationFramePhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> foundationFramePhoto;
 
     @ApiModelProperty(value = "组件铭牌安装照片")
-    private String nameplatePhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> nameplatePhoto;
 
     @ApiModelProperty(value = "配电箱、逆变器案场安装照片")
-    private String distributionBoxInverterPhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> distributionBoxInverterPhoto;
 
     @ApiModelProperty(value = "电表照片")
-    private String electricityMeterPhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> electricityMeterPhoto;
 
     @ApiModelProperty(value = "其他照片")
-    private String otherPhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> otherPhoto;
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,6 +30,7 @@ public class HouseholdPvLeaseDto  extends BaseDto {
     private String installAddress;
 
     @ApiModelProperty(value = "安装日期")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date installDate;
 
     @ApiModelProperty(value = "预计功率(w)")

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

+package com.yeejoin.amos.boot.module.jxiop.api.entity;
+
+import lombok.Data;
+
+@Data
+public class CommonFile {
+
+	private static final long serialVersionUID = 1L;
+
+	private String url;
+
+	private String name;
+
+	private String uid;
+
+	private String status;
+}

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

 package com.yeejoin.amos.boot.module.jxiop.api.entity;
 
+import java.util.Date;
+import java.util.List;
+
 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;
 
 /**
  * 户用光伏表
@@ -17,129 +21,129 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("household_pv")
+@TableName(value = "household_pv", autoResultMap = true)
 public class HouseholdPv extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    /**
-     * 户主姓名
-     */
+	/**
+	 * 户主姓名
+	 */
 	@TableField("name")
-    private String name;
+	private String name;
 
-    /**
-     * 户号
-     */
+	/**
+	 * 户号
+	 */
 	@TableField("number")
-    private String number;
+	private String number;
 
-    /**
-     * 厂商
-     */
+	/**
+	 * 厂商
+	 */
 	@TableField("platform_company_id")
-    private Long platformCompanyId;
+	private Long platformCompanyId;
 
-    /**
-     * 性别
-     */
+	/**
+	 * 性别
+	 */
 	@TableField("sex")
-    private String sex;
+	private String sex;
 
-    /**
-     * 身份证号
-     */
+	/**
+	 * 身份证号
+	 */
 	@TableField("ID_number")
-    private String idNumber;
+	private String idNumber;
 
-    /**
-     * 证件过期时间
-     */
+	/**
+	 * 证件过期时间
+	 */
 	@TableField("expiry_time")
-    private Date expiryTime;
+	private Date expiryTime;
 
-    /**
-     * 签发机关
-     */
+	/**
+	 * 签发机关
+	 */
 	@TableField("issuing_authority")
-    private String issuingAuthority;
+	private String issuingAuthority;
 
-    /**
-     * 户籍地址
-     */
+	/**
+	 * 户籍地址
+	 */
 	@TableField("residence_address")
-    private String residenceAddress;
+	private String residenceAddress;
 
-    /**
-     * 手机号码
-     */
+	/**
+	 * 手机号码
+	 */
 	@TableField("phone")
-    private String phone;
+	private String phone;
 
-    /**
-     * 居住地
-     */
+	/**
+	 * 居住地
+	 */
 	@TableField("address")
-    private String address;
+	private String address;
 
-    /**
-     * 邮编
-     */
+	/**
+	 * 邮编
+	 */
 	@TableField("postcode")
-    private String postcode;
-
-    /**
-     * 身份证正面
-     */
-	@TableField("ID_front_photo")
-    private String idFrontPhoto;
-
-    /**
-     * 身份证背面
-     */
-	@TableField("ID_back_photo")
-    private String idBackPhoto;
-
-    /**
-     * 房屋产权证
-     */
-	@TableField("house_property_certificate")
-    private String housePropertyCertificate;
-
-    /**
-     * 农户首页照片
-     */
-	@TableField("homepage_photo")
-    private String homepagePhoto;
-
-    /**
-     * 送达地址
-     */
+	private String postcode;
+
+	/**
+	 * 身份证正面
+	 */
+	@TableField(value = "ID_front_photo", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> idFrontPhoto;
+
+	/**
+	 * 身份证背面
+	 */
+	@TableField(value = "ID_back_photo", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> idBackPhoto;
+
+	/**
+	 * 房屋产权证
+	 */
+	@TableField(value = "house_property_certificate", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> housePropertyCertificate;
+
+	/**
+	 * 农户首页照片
+	 */
+	@TableField(value = "homepage_photo", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> homepagePhoto;
+
+	/**
+	 * 送达地址
+	 */
 	@TableField("service_address")
-    private String serviceAddress;
+	private String serviceAddress;
 
-    /**
-     * 组织机构code
-     */
+	/**
+	 * 组织机构code
+	 */
 	@TableField("org_code")
-    private String orgCode;
+	private String orgCode;
 
-    /**
-     * 告警等级
-     */
+	/**
+	 * 告警等级
+	 */
 	@TableField("level")
-    private String level;
+	private String level;
 
-    /**
-     * 区域id
-     */
+	/**
+	 * 区域id
+	 */
 	@TableField("district_id")
-    private Long districtId;
+	private Long districtId;
 
-    /**
-     * 创建时间
-     */
+	/**
+	 * 创建时间
+	 */
 	@TableField("create_time")
-    private Date createTime;
+	private Date createTime;
 
 }

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

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("household_pv_contact")
+@TableName(value = "household_pv_contact", autoResultMap = true)
 public class HouseholdPvContact extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
@@ -53,20 +53,20 @@ public class HouseholdPvContact extends BaseEntity {
 	/**
 	 * 屋顶租赁及使用协议
 	 */
-	@TableField("use_agreement")
-	private String useAgreement;
+	@TableField(value = "use_agreement", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> useAgreement;
 
 	/**
 	 * 签约视频
 	 */
-	@TableField("signing_video")
-	private String signingVideo;
+	@TableField(value = "signing_video", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> signingVideo;
 
 	/**
 	 * 备案证明
 	 */
-	@TableField("filing_certificate")
-	private String filingCertificate;
+	@TableField(value = "filing_certificate", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> filingCertificate;
 
 	/**
 	 * 创建时间

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.jxiop.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,63 +19,63 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("household_pv_install")
+@TableName(value = "household_pv_install", autoResultMap = true)
 public class HouseholdPvInstall extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    /**
-     * 户用光伏id
-     */
+	/**
+	 * 户用光伏id
+	 */
 	@TableField("household_pv_id")
-    private Long householdPvId;
+	private Long householdPvId;
 
-    /**
-     * 所属厂站
-     */
+	/**
+	 * 所属厂站
+	 */
 	@TableField("platform_company_id")
-    private String platformCompanyId;
+	private String platformCompanyId;
 
-    /**
-     * 安装信息描述
-     */
+	/**
+	 * 安装信息描述
+	 */
 	@TableField("description")
-    private String description;
+	private String description;
 
-    /**
-     * 基础框架整体安装照片
-     */
-	@TableField("foundation_frame_photo")
-    private String foundationFramePhoto;
+	/**
+	 * 基础框架整体安装照片
+	 */
+	@TableField(value = "foundation_frame_photo", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> foundationFramePhoto;
 
-    /**
-     * 组件铭牌安装照片
-     */
-	@TableField("nameplate_photo")
-    private String nameplatePhoto;
+	/**
+	 * 组件铭牌安装照片
+	 */
+	@TableField(value = "nameplate_photo", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> nameplatePhoto;
 
-    /**
-     * 配电箱、逆变器案场安装照片
-     */
-	@TableField("distribution_box_inverter_photo")
-    private String distributionBoxInverterPhoto;
+	/**
+	 * 配电箱、逆变器案场安装照片
+	 */
+	@TableField(value = "distribution_box_inverter_photo", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> distributionBoxInverterPhoto;
 
-    /**
-     * 电表照片
-     */
-	@TableField("electricity_meter_photo")
-    private String electricityMeterPhoto;
+	/**
+	 * 电表照片
+	 */
+	@TableField(value = "electricity_meter_photo", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> electricityMeterPhoto;
 
-    /**
-     * 其他照片
-     */
-	@TableField("other_photo")
-    private String otherPhoto;
+	/**
+	 * 其他照片
+	 */
+	@TableField(value = "other_photo", typeHandler = FastjsonTypeHandler.class)
+	private List<CommonFile> otherPhoto;
 
-    /**
-     * 创建时间
-     */
+	/**
+	 * 创建时间
+	 */
 	@TableField("create_time")
-    private Date createTime;
+	private Date createTime;
 
 }

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

@@ -144,17 +144,17 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 
 		HouseholdPvContact householdPvContact = new HouseholdPvContact();
 		BeanUtils.copyProperties(householdPvDto.getContactInfo(), householdPvContact);
-		iHouseholdPvContactService.update(new LambdaQueryWrapper<HouseholdPvContact>()
+		iHouseholdPvContactService.update(householdPvContact,new LambdaQueryWrapper<HouseholdPvContact>()
 				.eq(HouseholdPvContact::getHouseholdPvId, householdPvDto.getSequenceNbr()));
 
 		HouseholdPvLease householdPvLease = new HouseholdPvLease();
 		BeanUtils.copyProperties(householdPvDto.getLeaseInfo(), householdPvLease);
-		iHouseholdPvLeaseService.update(new LambdaQueryWrapper<HouseholdPvLease>()
+		iHouseholdPvLeaseService.update(householdPvLease,new LambdaQueryWrapper<HouseholdPvLease>()
 				.eq(HouseholdPvLease::getHouseholdPvId, householdPvDto.getSequenceNbr()));
 
 		HouseholdPvInstall householdPvInstall = new HouseholdPvInstall();
 		BeanUtils.copyProperties(householdPvDto.getInstallInfo(), householdPvInstall);
-		iHouseholdPvInstallService.update(new LambdaQueryWrapper<HouseholdPvInstall>()
+		iHouseholdPvInstallService.update(householdPvInstall,new LambdaQueryWrapper<HouseholdPvInstall>()
 				.eq(HouseholdPvInstall::getHouseholdPvId, householdPvDto.getSequenceNbr()));
 
 		return householdPvDto;