Merge remote-tracking branch 'origin/developer' into developer

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

@@ -163,7 +163,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
 			powerStation.setRecDate(new Date());
 
-			Boolean fl = this.saveOrUpdate(powerStation);
+			//Boolean fl = this.saveOrUpdate(powerStation);
+			// 避免生成多份数据
+			Boolean fl = this.saveOrUpdate(powerStation,new LambdaQueryWrapper<PowerStation>()
+					.eq(PowerStation::getPeasantHouseholdId,powerStation.getPeasantHouseholdId()));
 
 			PowerStationNodeEnum powerStationNodeEnum = PowerStationNodeEnum
 					.getNodeByCode(powerStation.getNextProcessNode());

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

@@ -215,6 +215,7 @@ public class QiyuesuoServiceImpl {
 		List<Stamper> stampers = new ArrayList<>();
 		stampers.add(stamper);
 		stampers.add(stamper2);
+		//发起合同
 		SdkResponse<Object> data = this.getSdkResponse(result.getId(), stampers);
 		return result.getId();
 	}