Merge branch 'energy-manage-chy'

energy-manage-service/src/main/java/com/energy/manage/service/service/analysis/impl/AnalysisServiceImpl.java

@@ -454,6 +454,10 @@ public class AnalysisServiceImpl implements AnalysisService {
      */
     private WindFieldDescriptVo getWindFieldDescriptVo(String fieldCode){
         WindFieldVo windFieldVo = windFieldMapper.selectByCodeNumber(fieldCode);
+        if(windFieldVo == null){
+            return new WindFieldDescriptVo();
+        }
+        windFieldVo.setRatedCapacityNumber(windFieldVo.getRatedCapacityNumber()/1000);
         WindFieldDescriptVo windFieldDescriptVo = new WindFieldDescriptVo();
         BeanUtils.copyProperties(windFieldVo,windFieldDescriptVo);
         List<WindEngineGroupPageVo> windEngineGroupPageVos = windEngineGroupMapper.selectWindEngineGroupListByFieldCode(fieldCode);