添加更新接口

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IHouseholdPvService.java

@@ -24,5 +24,7 @@ public interface IHouseholdPvService extends IService<HouseholdPv>{
     
     HouseholdPvDto save(HouseholdPvDto householdPvDto);
     
+    HouseholdPvDto update(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

@@ -96,7 +96,7 @@ public class HouseholdPvController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏表", notes = "根据sequenceNbr更新户用光伏表")
     public ResponseModel<HouseholdPvDto> updateBySequenceNbrHouseholdPv(@RequestBody HouseholdPvDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(householdPvServiceImpl.updateWithModel(model));
+        return ResponseHelper.buildResponse(householdPvServiceImpl.update(model));
     }
 
     /**

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

@@ -137,6 +137,30 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 	}
 
 	@Override
+	public HouseholdPvDto update(HouseholdPvDto householdPvDto) {
+		HouseholdPv householdPv = new HouseholdPv();
+		BeanUtils.copyProperties(householdPvDto, householdPv);
+		this.updateById(householdPv);
+
+		HouseholdPvContact householdPvContact = new HouseholdPvContact();
+		BeanUtils.copyProperties(householdPvDto.getContactInfo(), householdPvContact);
+		iHouseholdPvContactService.update(new LambdaQueryWrapper<HouseholdPvContact>()
+				.eq(HouseholdPvContact::getHouseholdPvId, householdPvDto.getSequenceNbr()));
+
+		HouseholdPvLease householdPvLease = new HouseholdPvLease();
+		BeanUtils.copyProperties(householdPvDto.getLeaseInfo(), householdPvLease);
+		iHouseholdPvLeaseService.update(new LambdaQueryWrapper<HouseholdPvLease>()
+				.eq(HouseholdPvLease::getHouseholdPvId, householdPvDto.getSequenceNbr()));
+
+		HouseholdPvInstall householdPvInstall = new HouseholdPvInstall();
+		BeanUtils.copyProperties(householdPvDto.getInstallInfo(), householdPvInstall);
+		iHouseholdPvInstallService.update(new LambdaQueryWrapper<HouseholdPvInstall>()
+				.eq(HouseholdPvInstall::getHouseholdPvId, householdPvDto.getSequenceNbr()));
+
+		return householdPvDto;
+	}
+
+	@Override
 	public HouseholdPvDto getBySeq(Long id) {
 		HouseholdPv householdPv = this.getById(id);
 		HouseholdPvDto householdPvDto = new HouseholdPvDto();
@@ -144,22 +168,29 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 
 		HouseholdPvContact householdPvContact = iHouseholdPvContactService
 				.getOne(new LambdaQueryWrapper<HouseholdPvContact>().eq(HouseholdPvContact::getHouseholdPvId, id));
-		HouseholdPvContactDto householdPvContactDto = new HouseholdPvContactDto();
-		BeanUtils.copyProperties(householdPvContact, householdPvContactDto);
-		householdPvDto.setContactInfo(householdPvContactDto);
+		if (householdPvContact != null) {
+			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);
+		if (householdPvLease != null) {
+			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);
-		
+		if (householdPvInstall != null) {
+			HouseholdPvInstallDto householdPvInstallDto = new HouseholdPvInstallDto();
+			BeanUtils.copyProperties(householdPvInstall, householdPvInstallDto);
+			householdPvDto.setInstallInfo(householdPvInstallDto);
+
+		}
+
 		return householdPvDto;
 	}
 }
\ No newline at end of file