| | |
| | | public AjaxResult holeProcess(Hole hole) { |
| | | |
| | | Hole hole2 = holeMapper.selectProjectProcess(hole.getProjectId()); |
| | | Double process = Arith.div(hole2.getFootageCpl(), hole2.getFootage(), 2); |
| | | Double process =0.0d; |
| | | if(ObjectUtil.isNotEmpty(hole2.getFootageCpl()) && ObjectUtil.isNotEmpty(hole2.getFootage())) { |
| | | process = Arith.div(hole2.getFootageCpl(), hole2.getFootage(), 2); |
| | | } |
| | | return AjaxResult.success(process); |
| | | |
| | | } |
| | |
| | | @PostMapping("/edit") |
| | | @ResponseBody |
| | | public AjaxResult editSave(Hole hole) { |
| | | if(isNotNull(hole.getFootage()) && isNotNull(hole.getFootageCpl())){ |
| | | if(ObjectUtil.isNotEmpty(hole.getFootage()) && ObjectUtil.isNotEmpty(hole.getFootageCpl())){ |
| | | Double rate = Arith.div(hole.getFootageCpl(),hole.getFootage(),2) ; |
| | | hole.setRate(rate); |
| | | } |
| | | return toAjax(holeService.updateHole(hole)); |
| | | } |
| | | |
| | | private boolean isNotNull(Double val){ |
| | | return val !=null && val !=0.0D; |
| | | } |
| | | |
| | | /** |
| | | * 删除钻孔 |