Merge remote-tracking branch 'origin/master' into master

+package com.skua.modules.algorithm.vo;
+
+import com.skua.tool.util.JSUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value="指挥中心:ReportItemVO", description="指挥中心:ReportItemVO详情类)")
+public class ReportItemVO {
+
+    @ApiModelProperty(value = "厂站编号")
+    private String departId;
+    @ApiModelProperty(value = "厂站名称")
+    private String departName;
+
+    @ApiModelProperty(value = "时间")
+    private String time;
+    @ApiModelProperty(value = "label描述")
+    private String label;
+    @ApiModelProperty(value = "结果")
+    private String value;
+    @ApiModelProperty(value = "日均数据")
+    private String avgDayValue;
+
+    @ApiModelProperty(value = "同比")
+    private String valueTb;
+    @ApiModelProperty(value = "同比比例")
+    private String valueTbBl;
+
+/*    @ApiModelProperty(value = "同比差值")
+    private String valueTbDifference;*/
+    @ApiModelProperty(value = "环比")
+    private String valueHb;
+    @ApiModelProperty(value = "环比比例")
+    private String valueHbBl;
+
+
+    @ApiModelProperty(value = "吨水产泥量")
+    private String dscnl;
+ /*   @ApiModelProperty(value = "环比差值")
+    private String valueHbDifference;
+      @ApiModelProperty(value = "单位")
+    private String unit;
+    */
+
+    public String getValueTbBl() {
+        valueTbBl = JSUtils.executeExpression("("+this.getValue()  + " - " + this.getValueTb() + ") / " +this.getValueTb(),"0.00") ;
+        return valueTbBl;
+    }
+
+    public String getValueHbBl() {
+        valueHbBl = JSUtils.executeExpression("("+this.getValue()  + " - " + this.getValueHb() + ") / " +this.getValueHb(),"0.00") ;
+        return valueHbBl;
+    }
+}

@@ -142,7 +142,7 @@
         FROM
             report_electric_cost
         WHERE
-            month BETWEEN '2024-01' AND '2024-10'
+            month BETWEEN #{startDate} AND ${endDate}
         GROUP BY month
     </select>
 

@@ -74,7 +74,7 @@ public class DrugConsumptionAnalusisServiceImpl implements IDrugConsumptionAnaly
 
         Map<String, Object> dsyhMap = queryForMap(sql.toString());// getJdbcTemplate().queryForMap(sql.toString());
         if(dsyhMap != null ){
-            displayVO.setLszddsyh( dsyhMap.get("dsyh")+"" );
+            displayVO.setLszddsyh( ConvertUtils.getString( dsyhMap.get("dsyh"),"0") );
             displayVO.setLszddsyhyf(  dsyhMap.get("time")+""  );
         }
 

@@ -102,6 +102,8 @@ public interface ISysFactoryInfoService extends IService<SysFactoryInfo> {
 
 	List<SysFactoryInfoVO> getFactoryListByWrapper(QueryWrapper<SysFactoryInfoVO> queryWrapper);
 
+
+
 	/**
 	 * 获取总的设计规模
 	 * @return