修改新增接口

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

@@ -2,10 +2,14 @@ package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 户用光伏合同表
@@ -28,7 +32,8 @@ public class HouseholdPvContactDto  extends BaseDto {
     private String number;
 
     @ApiModelProperty(value = "合同期限")
-    private String period;
+	@TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<String> period;
 
     @ApiModelProperty(value = "合同描述")
     private String description;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/HouseholdPvContact.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;
 
 /**
  * 户用光伏合同表
@@ -20,54 +24,54 @@ import java.util.Date;
 @TableName("household_pv_contact")
 public class HouseholdPvContact 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("number")
-    private String number;
+	private String number;
 
-    /**
-     * 合同期限
-     */
-	@TableField("period")
-    private String period;
+	/**
+	 * 合同期限
+	 */
+	@TableField(value = "period", typeHandler = FastjsonTypeHandler.class)
+	private List<String> period;
 
-    /**
-     * 合同描述
-     */
+	/**
+	 * 合同描述
+	 */
 	@TableField("description")
-    private String description;
+	private String description;
 
-    /**
-     * 屋顶租赁及使用协议
-     */
+	/**
+	 * 屋顶租赁及使用协议
+	 */
 	@TableField("use_agreement")
-    private String useAgreement;
+	private String useAgreement;
 
-    /**
-     * 签约视频
-     */
+	/**
+	 * 签约视频
+	 */
 	@TableField("signing_video")
-    private String signingVideo;
+	private String signingVideo;
 
-    /**
-     * 备案证明
-     */
+	/**
+	 * 备案证明
+	 */
 	@TableField("filing_certificate")
-    private String filingCertificate;
+	private String filingCertificate;
 
-    /**
-     * 创建时间
-     */
+	/**
+	 * 创建时间
+	 */
 	@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/service/IHouseholdPvService.java

@@ -23,4 +23,6 @@ public interface IHouseholdPvService extends IService<HouseholdPv>{
     void deleteBatch(List<Long> ids);
     
     HouseholdPvDto save(HouseholdPvDto householdPvDto);
+    
+    HouseholdPvDto getBySeq(Long id);
 }

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

@@ -111,7 +111,7 @@ public class HouseholdPvController extends BaseController {
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏表", notes = "根据sequenceNbr查询单个户用光伏表")
     public ResponseModel<HouseholdPvDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(householdPvServiceImpl.queryBySeq(sequenceNbr));
+        return ResponseHelper.buildResponse(householdPvServiceImpl.getBySeq(sequenceNbr));
     }
 
     /**

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

@@ -17,8 +17,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvContactDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvImport;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvInstallDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.HouseholdPvLeaseDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPv;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvContact;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.HouseholdPvInstall;
@@ -113,21 +116,48 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 		HouseholdPv householdPv = new HouseholdPv();
 		BeanUtils.copyProperties(householdPvDto, householdPv);
 		this.save(householdPv);
-		
+
 		HouseholdPvContact householdPvContact = new HouseholdPvContact();
 		BeanUtils.copyProperties(householdPvDto.getContactInfo(), householdPvContact);
 		householdPvContact.setHouseholdPvId(householdPv.getSequenceNbr());
 		iHouseholdPvContactService.save(householdPvContact);
-		
+
 		HouseholdPvLease householdPvLease = new HouseholdPvLease();
 		BeanUtils.copyProperties(householdPvDto.getLeaseInfo(), householdPvLease);
 		householdPvContact.setHouseholdPvId(householdPv.getSequenceNbr());
 		iHouseholdPvLeaseService.save(householdPvLease);
-		
+
 		HouseholdPvInstall householdPvInstall = new HouseholdPvInstall();
 		BeanUtils.copyProperties(householdPvDto.getInstallInfo(), householdPvInstall);
 		householdPvInstall.setHouseholdPvId(householdPv.getSequenceNbr());
 		iHouseholdPvInstallService.save(householdPvInstall);
+
+		return householdPvDto;
+	}
+
+	@Override
+	public HouseholdPvDto getBySeq(Long id) {
+		HouseholdPv householdPv = this.getById(id);
+		HouseholdPvDto householdPvDto = new HouseholdPvDto();
+		BeanUtils.copyProperties(householdPv, householdPvDto);
+
+		HouseholdPvContact householdPvContact = iHouseholdPvContactService
+				.getOne(new LambdaQueryWrapper<HouseholdPvContact>().eq(HouseholdPvContact::getHouseholdPvId, id));
+		HouseholdPvContactDto householdPvContactDto = new HouseholdPvContactDto();
+		BeanUtils.copyProperties(householdPvContact, householdPvContactDto);
+		householdPvDto.setContactInfo(householdPvContactDto);
+
+		HouseholdPvLease householdPvLease = iHouseholdPvLeaseService
+				.getOne(new LambdaQueryWrapper<HouseholdPvLease>().eq(HouseholdPvLease::getHouseholdPvId, id));
+		HouseholdPvLeaseDto householdPvLeaseDto = new HouseholdPvLeaseDto();
+		BeanUtils.copyProperties(householdPvLease, householdPvLeaseDto);
+		householdPvDto.setLeaseInfo(householdPvLeaseDto);
+
+		HouseholdPvInstall householdPvInstall = iHouseholdPvInstallService
+				.getOne(new LambdaQueryWrapper<HouseholdPvInstall>().eq(HouseholdPvInstall::getHouseholdPvId, id));
+		HouseholdPvInstallDto householdPvInstallDto = new HouseholdPvInstallDto();
+		BeanUtils.copyProperties(householdPvInstall, householdPvInstallDto);
+		householdPvDto.setInstallInfo(householdPvInstallDto);
 		
 		return householdPvDto;
 	}