【小程序端-施工管理】施工资料上传扫描设备后电站状态应该变为“施工中”

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

@@ -505,10 +505,9 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			workOrderMapper.update(null, upq);
 
 		}
-
+		Date date = new Date();
 		// 增加操作日志
 		if (powerStationConstructionData.getSequenceNbr() != null) {
-			Date date = new Date();
 			// 第一次点击“施工资料上传”按钮会生成一条数据
 			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "编辑施工资料",
 					date, "", powerStationConstructionData.getWorkOrderId(),
@@ -516,23 +515,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
 			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
 			pcr.eq(ConstructionRecords::getWorkOrderPowerStationId, powerStationConstructionData.getWorkOrderPowerStationId());
-			pcr.eq(ConstructionRecords::getOperationContent, "新增施工资料");// 自审不通过，重新上传的时候不要覆盖之前的数据
+			pcr.eq(ConstructionRecords::getOperationContent, "编辑施工资料");// 自审不通过，重新上传的时候不要覆盖之前的数据
 			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
-			//添加施工开始时间
-			WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
-			if(Objects.nonNull(workOrderPowerStation) && Objects.isNull(workOrderPowerStation.getSgCreateTime())){
-				LambdaUpdateWrapper<WorkOrderPowerStation> wrapper = new LambdaUpdateWrapper<>();
-				wrapper.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.施工中.getCode());
-				wrapper.set(WorkOrderPowerStation::getSgCreateTime, date);
-				wrapper.eq(WorkOrderPowerStation::getSequenceNbr, powerStationConstructionData.getWorkOrderPowerStationId());
-				workOrderPowerStationMapper.update(null,wrapper);
-				//将派工单的状态改为施工中
-				LambdaUpdateWrapper<WorkOrder> wrapper1 = new LambdaUpdateWrapper<>();
-				wrapper1.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.施工中.getCode());
-				wrapper1.eq(WorkOrder::getSequenceNbr, powerStationConstructionData.getWorkOrderId());
-				workOrderMapper.update(null, wrapper1);
-			}
-
 		} else {
 			ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "新增施工资料",
 					new Date(), "", powerStationConstructionData.getWorkOrderId(),
@@ -540,9 +524,23 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 			LambdaUpdateWrapper<ConstructionRecords> pcr = new LambdaUpdateWrapper<>();
 			pcr.eq(ConstructionRecords::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
 			pcr.eq(ConstructionRecords::getWorkOrderPowerStationId, powerStationConstructionData.getWorkOrderPowerStationId());
+			pcr.eq(ConstructionRecords::getOperationContent, "新增施工资料");
 			constructionRecordsServiceImpl.saveOrUpdate(da,pcr);
 		}
-
+		//添加施工开始时间
+		WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
+		if(Objects.nonNull(workOrderPowerStation) && Objects.isNull(workOrderPowerStation.getSgCreateTime())){
+			LambdaUpdateWrapper<WorkOrderPowerStation> wrapper = new LambdaUpdateWrapper<>();
+			wrapper.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.施工中.getCode());
+			wrapper.set(WorkOrderPowerStation::getSgCreateTime, date);
+			wrapper.eq(WorkOrderPowerStation::getSequenceNbr, powerStationConstructionData.getWorkOrderPowerStationId());
+			workOrderPowerStationMapper.update(null,wrapper);
+			//将派工单的状态改为施工中
+			LambdaUpdateWrapper<WorkOrder> wrapper1 = new LambdaUpdateWrapper<>();
+			wrapper1.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.施工中.getCode());
+			wrapper1.eq(WorkOrder::getSequenceNbr, powerStationConstructionData.getWorkOrderId());
+			workOrderMapper.update(null, wrapper1);
+		}
 		// 新增施工信息
 		// 防止重复添加
 		LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper<>();