修改施工

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
@@ -163,14 +165,19 @@ public class WorkOrderController extends BaseController {
     @GetMapping(value = "/getWorkOrderHousehold")
     public ResponseModel<  Page<PeasantHousehold>  > getPeasantHouseholdData(
             @RequestParam(required=false) Long sequenceNbr,
+            @RequestParam(required=false) Integer current,
+            @RequestParam(required=false) Integer size,
             @RequestParam(required=false) String ownersName
     ) {
+        Page<PeasantHousehold> page = new Page<>();
+        PageHelper.startPage(current,size);
         List<PeasantHousehold> list=workOrderPowerStationMapper.selectPeasantHousehold(sequenceNbr,ownersName);
-
-        Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
-        pagenew.setRecords(list);
-        pagenew.setTotal(list.size());
-        return ResponseHelper.buildResponse(pagenew);
+        PageInfo<PeasantHousehold> pageInfo = new PageInfo<>(list);
+        page.setSize(pageInfo.getSize());
+        page.setCurrent(pageInfo.getPageNum());
+        page.setTotal(pageInfo.getTotal());
+        page.setRecords(list);
+        return ResponseHelper.buildResponse(page);
     }
 
 

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

@@ -313,6 +313,19 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		if (powerStationConstructionData.isCommitFlow()) {
 //        if(powerStationConstructionData.getSequenceNbr()!=null){
 
+
+			// 修改施工电站状态
+			LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper();
+			up.eq(WorkOrderPowerStation::getSequenceNbr, powerStationConstructionData.getWorkOrderPowerStationId());
+			if (powerStationConstructionData.getConstructionStatus().equals("未完成")) {
+				up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.施工中.getCode());
+			} else {
+				up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.待登记.getCode());
+
+//				WorkOrderPowerStation basicGridAcceptanc = workOrderPowerStationMapper
+//						.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
+
+
 				LambdaQueryWrapper<HygfWorkOrderStationAuditing> audit = new LambdaQueryWrapper();
 				audit.eq(HygfWorkOrderStationAuditing::getWorkOrderPowerStationId, powerStationConstructionData.getWorkOrderPowerStationId());
 				audit.last("limit 1");
@@ -345,23 +358,12 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 				}
 
 
-			// 修改施工电站状态
-			LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper();
-			up.eq(WorkOrderPowerStation::getSequenceNbr, powerStationConstructionData.getWorkOrderPowerStationId());
-			if (powerStationConstructionData.getConstructionStatus().equals("未完成")) {
-				up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.施工中.getCode());
-			} else {
-				up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.待登记.getCode());
-
-				WorkOrderPowerStation basicGridAcceptanc = workOrderPowerStationMapper
-						.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
-				// 施工完成
-				LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
-				up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
-				long idsk = basicGridAcceptanc.getPeasantHouseholdId();
-				up1.eq(PeasantHousehold::getSequenceNbr, idsk);
-				peasantHouseholdMapper.update(null, up1);
-
+//				// 施工完成
+//				LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
+//				up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
+//				long idsk = basicGridAcceptanc.getPeasantHouseholdId();
+//				up1.eq(PeasantHousehold::getSequenceNbr, idsk);
+//				peasantHouseholdMapper.update(null, up1);
 			}
 			up.set(WorkOrderPowerStation::getPowerStationAreaStatus,null);
 			up.set(WorkOrderPowerStation::getPowerStationDesignStatus,null);