Skip to content

A
amos-boot-zx-biz
Commit 56fc9211 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

27328 施工管理每个设备信息填写完成后可保存

parent fdd96dcf
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 61 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PowerStationConstructionData.java
View file @ 56fc9211
...@@ -180,4 +180,10 @@ public class PowerStationConstructionData extends BaseEntity { ...@@ -180,4 +180,10 @@ public class PowerStationConstructionData extends BaseEntity {
@TableField("work_order_power_station_id") @TableField("work_order_power_station_id")
private Long workOrderPowerStationId; private Long workOrderPowerStationId;
/**
* 是否提交流程
*/
@TableField(exist = false)
private boolean commitFlow;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/WorkOrderController.java
View file @ 56fc9211
...@@ -202,7 +202,7 @@ public class WorkOrderController extends BaseController { ...@@ -202,7 +202,7 @@ public class WorkOrderController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/getPowerStationConstructionData") @PostMapping (value = "/getPowerStationConstructionData")
@ApiOperation(httpMethod = "GET",value = "无分页查询", notes = "无分页查询") @ApiOperation(httpMethod = "GET",value = "无分页查询", notes = "无分页查询")
public ResponseModel<Map<String,Object>> getPowerStationConstructionData( public ResponseModel<PowerStationConstructionData> getPowerStationConstructionData(
@RequestBody PowerStationConstructionData powerStationConstructionData @RequestBody PowerStationConstructionData powerStationConstructionData
) { ) {
//查询施工信息 //查询施工信息
...@@ -210,10 +210,7 @@ public class WorkOrderController extends BaseController { ...@@ -210,10 +210,7 @@ public class WorkOrderController extends BaseController {
up.eq(PowerStationConstructionData::getWorkOrderId,powerStationConstructionData.getWorkOrderId()); up.eq(PowerStationConstructionData::getWorkOrderId,powerStationConstructionData.getWorkOrderId());
up.eq(PowerStationConstructionData::getWorkOrderPowerStationId,powerStationConstructionData.getWorkOrderPowerStationId()); up.eq(PowerStationConstructionData::getWorkOrderPowerStationId,powerStationConstructionData.getWorkOrderPowerStationId());
PowerStationConstructionData da= powerStationConstructionDataMapper.selectOne(up); PowerStationConstructionData da= powerStationConstructionDataMapper.selectOne(up);
Map<String,Object> map =new HashMap<>(); return ResponseHelper.buildResponse(da!=null?da:new PowerStationConstructionData());
map.put("powerStationConstructionData",da!=null?da:new PowerStationConstructionData());
map.put("powerStationConstructionDatafj",da!=null?da:new PowerStationConstructionData());
return ResponseHelper.buildResponse(map);
} }
...@@ -221,7 +218,7 @@ public class WorkOrderController extends BaseController { ...@@ -221,7 +218,7 @@ public class WorkOrderController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/addOrUpdate") @PostMapping (value = "/addOrUpdate")
@ApiOperation(httpMethod = "GET",value = "无分页查询", notes = "无分页查询") @ApiOperation(httpMethod = "POST",value = "施工信息添加或者修改", notes = "施工信息添加或者修改")
public ResponseModel<PowerStationConstructionData> addOrUpdate( public ResponseModel<PowerStationConstructionData> addOrUpdate(
@RequestBody PowerStationConstructionData powerStationConstructionData @RequestBody PowerStationConstructionData powerStationConstructionData
) { ) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
View file @ 56fc9211
...@@ -254,67 +254,70 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -254,67 +254,70 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
@Transactional @Transactional
public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) { public PowerStationConstructionData addOrUpdate(PowerStationConstructionData powerStationConstructionData) {
//如果不是提交进行单独保存
if(powerStationConstructionData.isCommitFlow()){
// if(powerStationConstructionData.getSequenceNbr()!=null){ // if(powerStationConstructionData.getSequenceNbr()!=null){
// 修改施工电站状态 // 修改施工电站状态
LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper(); LambdaUpdateWrapper<WorkOrderPowerStation> up = new LambdaUpdateWrapper();
up.eq(WorkOrderPowerStation::getSequenceNbr, powerStationConstructionData.getWorkOrderPowerStationId()); up.eq(WorkOrderPowerStation::getSequenceNbr, powerStationConstructionData.getWorkOrderPowerStationId());
if (powerStationConstructionData.getConstructionStatus().equals("未完成")) { if (powerStationConstructionData.getConstructionStatus().equals("未完成")) {
up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.施工中.getCode()); up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.施工中.getCode());
} else { } else {
up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.待登记.getCode()); up.set(WorkOrderPowerStation::getPowerStationConstructionStatus, WorkOrderEnum.待登记.getCode());
WorkOrderPowerStation basicGridAcceptanc = workOrderPowerStationMapper WorkOrderPowerStation basicGridAcceptanc = workOrderPowerStationMapper
.selectById(powerStationConstructionData.getWorkOrderPowerStationId()); .selectById(powerStationConstructionData.getWorkOrderPowerStationId());
// 施工完成 // 施工完成
LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PeasantHousehold> up1 = new LambdaUpdateWrapper<>();
up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode()); up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
long idsk = basicGridAcceptanc.getPeasantHouseholdId(); long idsk = basicGridAcceptanc.getPeasantHouseholdId();
up1.eq(PeasantHousehold::getSequenceNbr, idsk); up1.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up1); peasantHouseholdMapper.update(null, up1);
} }
workOrderPowerStationMapper.update(null, up); workOrderPowerStationMapper.update(null, up);
// 修改派工单状态 // 修改派工单状态
LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper(); LambdaQueryWrapper<WorkOrderPowerStation> qu = new LambdaQueryWrapper();
qu.eq(WorkOrderPowerStation::getWorkOrderId, powerStationConstructionData.getWorkOrderId()); qu.eq(WorkOrderPowerStation::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
List<String> d = new ArrayList<>(); List<String> d = new ArrayList<>();
d.add(WorkOrderEnum.施工中.getCode()); d.add(WorkOrderEnum.施工中.getCode());
d.add(WorkOrderEnum.待施工.getCode()); d.add(WorkOrderEnum.待施工.getCode());
qu.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d); qu.in(WorkOrderPowerStation::getPowerStationConstructionStatus, d);
List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu); List<WorkOrderPowerStation> list = workOrderPowerStationMapper.selectList(qu);
LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr, powerStationConstructionData.getWorkOrderId());
if (list != null && !list.isEmpty()) {
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.施工中.getCode());
} else {
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.登记中.getCode());
}
workOrderMapper.update(null, upq);
LambdaUpdateWrapper<WorkOrder> upq = new LambdaUpdateWrapper();
upq.eq(WorkOrder::getSequenceNbr, powerStationConstructionData.getWorkOrderId());
if (list != null && !list.isEmpty()) {
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.施工中.getCode());
} else {
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.登记中.getCode());
} }
workOrderMapper.update(null, upq); // 新增施工信息
// 防止重复添加
LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
powerStationConstructionData.getWorkOrderPowerStationId());
psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
// 增加操作日志
if (powerStationConstructionData.getSequenceNbr() != null) {
ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "编辑施工资料",
new Date(), "", powerStationConstructionData.getWorkOrderId(),
powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
constructionRecordsServiceImpl.save(da);
} else {
ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "新增施工资料",
new Date(), "", powerStationConstructionData.getWorkOrderId(),
powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
constructionRecordsServiceImpl.save(da);
}
// 新增施工信息
// 防止重复添加
LambdaUpdateWrapper<PowerStationConstructionData> psc = new LambdaUpdateWrapper();
psc.eq(PowerStationConstructionData::getWorkOrderPowerStationId,
powerStationConstructionData.getWorkOrderPowerStationId());
psc.eq(PowerStationConstructionData::getWorkOrderId, powerStationConstructionData.getWorkOrderId());
powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData, psc);
// powerStationConstructionDataService.saveOrUpdate(powerStationConstructionData);
// 增加操作日志
if (powerStationConstructionData.getSequenceNbr() != null) {
ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "编辑施工资料",
new Date(), "", powerStationConstructionData.getWorkOrderId(),
powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
constructionRecordsServiceImpl.save(da);
} else {
ConstructionRecords da = new ConstructionRecords(powerStationConstructionData.getRecUserName(), "新增施工资料",
new Date(), "", powerStationConstructionData.getWorkOrderId(),
powerStationConstructionData.getWorkOrderPowerStationId(), null, "");
constructionRecordsServiceImpl.save(da);
}
// }else{ // }else{
// //修改施工电站状态 // //修改施工电站状态
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment