解决能耗统计字段传回前端不正确

jjt-biz/src/main/java/com/jjt/ws/domain/TwinWorkshopCalc.java

@@ -2,6 +2,7 @@ package com.jjt.ws.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jjt.common.annotation.Excel;
 import com.jjt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -61,6 +62,7 @@ public class TwinWorkshopCalc extends BaseEntity {
      */
     @ApiModelProperty("A班价格")
     @Excel(name = "A班价格")
+    @JsonProperty("aPrice")
     private BigDecimal aPrice;
 
     /**
@@ -68,6 +70,7 @@ public class TwinWorkshopCalc extends BaseEntity {
      */
     @ApiModelProperty("B班价格")
     @Excel(name = "B班价格")
+    @JsonProperty("bPrice")
     private BigDecimal bPrice;
 
     /**
@@ -82,6 +85,7 @@ public class TwinWorkshopCalc extends BaseEntity {
      */
     @ApiModelProperty("A班统计")
     @Excel(name = "A班统计")
+    @JsonProperty("aValue")
     private BigDecimal aValue;
 
     /**
@@ -89,6 +93,7 @@ public class TwinWorkshopCalc extends BaseEntity {
      */
     @ApiModelProperty("B班统计")
     @Excel(name = "B班统计")
+    @JsonProperty("bValue")
     private BigDecimal bValue;
 
     public void setValue(BigDecimal aValue, BigDecimal bValue) {

jjt-biz/src/main/resources/mapper/ws/TwinWorkshopCalcMapper.xml

@@ -47,6 +47,7 @@
             <if test="totalValue != null ">and TOTAL_VALUE = #{totalValue}</if>
             <if test="aValue != null ">and A_VALUE = #{aValue}</if>
             <if test="bValue != null ">and B_VALUE = #{bValue}</if>
+            <if test="params.beginDataDate != null and params.beginDataDate != '' and params.endDataDate != null and params.endDataDate != ''"> and DATA_DATE between #{params.beginDataDate} and #{params.endDataDate}</if>
         </where>
     </select>