修改客户问题

@@ -15,4 +15,14 @@ public class EquipmentCapacityDto {
     private String type;
     private String unit;
     private EquipmentCapacityDto2 equipmentCapacityDto2;
+
+    public void setName(String name) {
+        this.name = name;
+        this.unit = "万元";
+    }
+
+    public void setData(String data) {
+        this.data = data;
+        this.unit = "万元";
+    }
 }

@@ -74,7 +74,20 @@ public class Synthesize_no_2_3 implements Serializable {
     @ApiModelProperty(hidden = true)
     @TableField(exist = false)
     private ColdMsgDto coldMsgDto;
+
     @ApiModelProperty(hidden = true)
     @TableField(exist = false)
     private HotWaterDto hotWaterDto;
+
+    @ApiModelProperty("供热参数 标识")
+    private String hotMsgFlag;
+
+    @ApiModelProperty("供冷参数 标识")
+    private String coldMsgFlag;
+
+    @ApiModelProperty("热水参数 标识")
+    private String hotWaterMsgFlag;
+
+
+
 }

 package com.synthesize_energy.item.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.util.function.Function;
 
 /**
  * @author kgy
@@ -50,6 +41,9 @@ public class CalculateLoadVo {
 
     public void setNo22(Double no22) {
         this.no22 = Double.valueOf(df.format(no22 * 0.0036));
+        if (!this.no2.equals(this.no22)){
+            this.no22 = no22;
+        }
     }
 
     public void setNo3(Double no3) {
@@ -58,5 +52,8 @@ public class CalculateLoadVo {
 
     public void setNo33(Double no33) {
         this.no33 = Double.valueOf(df.format(no33 * 0.0036));
+        if (!this.no3.equals(this.no33)){
+            this.no33 = no33;
+        }
     }
 }

@@ -56,7 +56,7 @@ public class ProjectController {
     }
 
     @GetMapping("getHeatingDays/{id}")
-    @ApiOperation(value = "获取供热天数")
+    @ApiOperation(value = "获取供热天数 跟 供电天数")
     public RestResponse<?> getHeatingDays(
             @PathVariable("id") @ApiParam(value = "id", name = "项目ID") String id
     ) {

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.synthesize_energy.item.entity.Synthesize_no_1;
 
+import java.util.Map;
+
 /**
  * @author kgy
  * @version 1.0
@@ -21,5 +23,5 @@ public interface No_1Service extends IService<Synthesize_no_1> {
      */
     void settingType(String type, String ids);
 
-    Integer getHeatingDays(String id);
+    Map<String, Object> getHeatingDays(String id);
 }

@@ -16,10 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author kgy
@@ -345,11 +342,14 @@ public class No_1ServiceImpl extends ServiceImpl<No_1Mapper, Synthesize_no_1> im
     }
 
     @Override
-    public Integer getHeatingDays(String id) {
+    public Map<String, Object> getHeatingDays(String id) {
+        Map<String, Object> map = new HashMap<>(2);
         Synthesize_no_1 synthesize_no_1 = no_1Service.getById(id);
         Assert.notNull(synthesize_no_1, "请先保存项目信息!");
         CityDict dict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, synthesize_no_1.getProjectSite()));//城市
         HeatIngData heatIngData = heatIngDataMapper.selectById(dict.getId());
-        return heatIngData.getNo3();
+        map.put("num1", heatIngData.getNo3());
+        map.put("num2", 24);
+        return map;
     }
 }

@@ -325,7 +325,7 @@ public class ProjectServiceImpl implements ProjectService {
         synthesize_no_3_6.setNo222(0.0D);
         synthesize_no_3_6.setNo223(0.0D);
         synthesize_no_3_6.setNo224(0.0D);
-        List<CalculateLoad> list1 = calculateLoadService.list(new QueryWrapper<CalculateLoad>().lambda().eq(CalculateLoad::getCid, id));// 年总需电量 年总需热量 年总需冷量
+        List<CalculateLoad> list1 = calculateLoadService.list(new LambdaQueryWrapper<CalculateLoad>().eq(CalculateLoad::getCid, id));// 年总需电量 年总需热量 年总需冷量
         synthesize_no_3_6.setId(id);
         synthesize_no_3_6.setNo1("0");
         synthesize_no_3_6.setNo2(0.0D);
@@ -3558,7 +3558,6 @@ public class ProjectServiceImpl implements ProjectService {
                 equipmentCapacityDto.setName("供电");
                 equipmentCapacityDto.setData(format.apply(new BigDecimal(Double.parseDouble(synthesize_no_3_6.getNo1()) / 10000)));
                 equipmentCapacityDto.setType("1");
-                equipmentCapacityDto.setUnit("万元");
                 list.add(equipmentCapacityDto);
             } else if ("2".equals(s)) {
                 /**
@@ -3568,7 +3567,6 @@ public class ProjectServiceImpl implements ProjectService {
                 equipmentCapacityDto.setName("供热");
                 equipmentCapacityDto.setData(format.apply(new BigDecimal(Double.parseDouble(String.valueOf(synthesize_no_3_6.getNo2())) / 10000)));
                 equipmentCapacityDto.setType("2");
-                equipmentCapacityDto.setUnit("万元");
                 list.add(equipmentCapacityDto);
             } else if ("3".equals(s)) {
                 /**
@@ -3578,7 +3576,6 @@ public class ProjectServiceImpl implements ProjectService {
                 equipmentCapacityDto.setName("供冷");
                 equipmentCapacityDto.setData(format.apply(new BigDecimal(Double.parseDouble(String.valueOf(synthesize_no_3_6.getNo3())) / 10000)));
                 equipmentCapacityDto.setType("3");
-                equipmentCapacityDto.setUnit("万元");
                 list.add(equipmentCapacityDto);
             } else if ("4".equals(s)) {
                 /**
@@ -3588,7 +3585,6 @@ public class ProjectServiceImpl implements ProjectService {
                 equipmentCapacityDto.setName("热水");
                 equipmentCapacityDto.setData(format.apply(new BigDecimal(Double.parseDouble(String.valueOf(synthesize_no_3_6.getNo4())) / 10000)));
                 equipmentCapacityDto.setType("3");
-                equipmentCapacityDto.setUnit("万元");
                 list.add(equipmentCapacityDto);
             }
         }