fix (farm): 微信小程序,地块,首页
- 登录流程 调整 - 地块编号 需要修改 - 首页 在种面积
This commit is contained in:
@@ -55,6 +55,7 @@ public class HomeController {
|
||||
return success(homeService.getBaseNameList());
|
||||
}
|
||||
|
||||
@PermitAll
|
||||
@Operation(summary = "农场首页-天气信息-获取天气信息")
|
||||
@GetMapping("/weather/{lng}/{lat}")
|
||||
public CommonResult<String> getBaseNameList(@PathVariable("lng") String lng,
|
||||
|
||||
@@ -95,6 +95,7 @@ public class PlotInfoServiceImpl implements PlotInfoService {
|
||||
@Transactional
|
||||
@Override
|
||||
public void updatePlotInfo(PlotInfoSaveReqVO updateReqVO) {
|
||||
updateReqVO.setPlotId(updateReqVO.getCode());
|
||||
// 校验存在
|
||||
validatePlotInfoExists(updateReqVO.getId());
|
||||
// 校验地块面积
|
||||
|
||||
@@ -343,7 +343,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
|
||||
if (plotArea == null) {
|
||||
return String.valueOf(totalArea);
|
||||
}
|
||||
return totalArea + "/" + plotArea + "亩";
|
||||
return plotArea.intValue() + "/" +(int) Math.round(totalArea) + "亩";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user