提价重复规避

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

@@ -34,6 +34,8 @@ public class BasicGridAcceptanceServiceImpl
 	@Autowired
 	HygfOnGridMapper onGridMapper;
 	@Autowired
+	HygfOnGridServiceImpl hygfOnGridServiceImpl;
+	@Autowired
 	PersonnelBusinessMapper personnelBusinessMapper;
 	@Autowired
 	WorkflowImpl workflow;
@@ -124,11 +126,17 @@ public class BasicGridAcceptanceServiceImpl
 			peasantHouseholdMapper.update(null, up);
 
 		}
-		if (grid.getSequenceNbr() != null) {
-			onGridMapper.updateById(grid);
-		} else {
-			onGridMapper.insert(grid);
-		}
+		
+		//防止重复提交
+//		if (grid.getSequenceNbr() != null) {
+//			onGridMapper.updateById(grid);
+//		} else {
+//			onGridMapper.insert(grid);
+//		}
+		LambdaQueryWrapper<HygfOnGrid> hog = new LambdaQueryWrapper<>();
+		hog.eq(HygfOnGrid::getPeasantHouseholdId, grid.getPeasantHouseholdId());
+		hygfOnGridServiceImpl.saveOrUpdate(grid,hog);
+		
 		basicGridAcceptanceMapper.updateById(basicGridAcceptance);
 
 		//发起待办

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

@@ -832,9 +832,6 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderMapper.update(null, upq);
 		}
 		// 新增完工登记
-
-	
-
 		PowerStationEngineeringInfo powerStationEngineeringInfo = powerStationEngineeringInfoAllDto
 				.getPowerStationEngineeringInfo();
 		powerStationEngineeringInfo.setWorkOrderId(workOrderPowerStation.getWorkOrderId());