kangwei：新增三个大屏组件开发-接口

@@ -29,7 +29,7 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep
     @Transactional
     @Override
     public void saveOrUpdateMaterialAcceptanceForm(MaterialAcceptanceForm materialAcceptanceForm) {
-        MaterialAcceptanceForm materialAcceptanceFormEntity = baseMapper.queryByMaterialInId(materialAcceptanceForm.getId());
+        MaterialAcceptanceForm materialAcceptanceFormEntity = baseMapper.queryById(materialAcceptanceForm.getId());
         if(materialAcceptanceFormEntity==null) {
             //result.error500("未找到对应实体");
             baseMapper.insert(materialAcceptanceForm);
@@ -37,7 +37,7 @@ public class MaterialAcceptanceFormServiceImpl extends ServiceImpl<MaterialAccep
             baseMapper.updateById(materialAcceptanceForm);
         }
         //修改药剂入库的确认状态
-        baseMapper.updateMaterialINConfirmStatus(materialAcceptanceForm.getId(),materialAcceptanceForm.getConfirmStatus());
+        baseMapper.updateMaterialINConfirmStatus(materialAcceptanceForm.getMaterialInId(),materialAcceptanceForm.getConfirmStatus());
 
     }
     public MaterialAcceptanceForm queryById(String id){

+package com.skua.modules.statistics.service;
+
+import com.skua.modules.statistics.vo.ReportTargetEnergyVO;
+import com.skua.modules.statistics.vo.ReportTargetStatisticsVO;
+
+import java.util.List;
+
+/**
+ * @auther kangwei
+ * @create 2025-03-21-14:19
+ */
+public interface IReportTargetStatisticsService {
+    /***
+     *   水量经营分析
+     * @param departIds
+     * @param year
+     * @param endTime
+     * @return
+     */
+    public ReportTargetStatisticsVO targetWaterStatistics(String departIds, String year , String startTime, String endTime );
+    //水量经营分析 列表
+    public List<ReportTargetStatisticsVO> targetWaterStatisticsList(String departIds, String year , String startTime, String endTime);
+
+    /***
+     *   能耗经营分析
+     * @param departIds
+     * @param year
+     * @param
+     * @return
+     */
+    public ReportTargetEnergyVO targetEnergyStatistics(String departIds, String year , String startTime, String endTime);
+    //能耗分析：列表
+    public List<ReportTargetEnergyVO>  targetEnergyStatisticsList(String departIds,String year ,String startTime,String endTime);
+
+    /***
+     *   费用经营分析
+     * @param departIds
+     * @param year
+     * @param
+     * @return
+     */
+    public ReportTargetStatisticsVO  targetCostStatistics(String departIds,String year ,String startTime,String endTime);
+    //费用经营分析 --列表
+    public List<ReportTargetStatisticsVO>  targetCostStatisticsList(String departIds,String year ,String startTime,String endTime);
+}

+package com.skua.modules.statistics.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @auther kangwei
+ * @create 2025-03-21-15:10
+ */
+@Data
+@ApiModel(value="ReportTargetInfoVO ", description="运营目标报表分析对象")
+public class ReportTargetEnergyVO {
+
+    @ApiModelProperty(value = "机构ID")
+    private String departId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String departName;
+
+    @ApiModelProperty(value = "吨水电费年目标")
+    private String dsdfYearTarget;
+
+    @ApiModelProperty(value = "吨水药费年目标")
+    private String dsyfYearTarget;
+
+    @ApiModelProperty(value = "吨水电费实际值")
+    private String dsdfValue;
+
+    @ApiModelProperty(value = "吨水药费实际值")
+    private String dsyfValue;
+
+
+    public ReportTargetEnergyVO(){
+
+    }
+
+    public ReportTargetEnergyVO(String dsdfYearTarget, String dsdfValue, String dsyfYearTarget, String dsyfValue) {
+        this.dsdfYearTarget = dsdfYearTarget;
+        this.dsyfYearTarget = dsyfYearTarget;
+        this.dsdfValue = dsdfValue;
+        this.dsyfValue = dsyfValue;
+    }
+
+    @ApiModelProperty(value = "列表数据")
+    private List<ReportTargetEnergyVO> dataList = null;
+}

+package com.skua.modules.statistics.vo;
+
+import com.skua.core.aspect.annotation.Dict;
+import com.skua.tool.util.JSUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @auther kangwei
+ * @create 2025-03-21-14:22
+ */
+@Data
+@ApiModel(value="ReportTargetInfoVO ", description="运营目标报表分析对象")
+public class ReportTargetInfoVO {
+
+
+    @ApiModelProperty(value = "目标Code")
+    private String targetCode;
+
+    @ApiModelProperty(value = "目标名称")
+    private String targetName;
+
+    @ApiModelProperty(value = "目标值")
+    private String targetValue;
+
+    @ApiModelProperty(value = "实际值")
+    private String value;
+
+    public ReportTargetInfoVO() {
+    }
+
+    public ReportTargetInfoVO(String targetCode, String targetName, String targetValue, String value) {
+        this.targetCode = targetCode;
+        this.targetName = targetName;
+        this.targetValue = targetValue;
+        this.value = value;
+    }
+}

+package com.skua.modules.statistics.vo;
+
+import com.skua.core.aspect.annotation.Dict;
+import com.skua.tool.util.JSUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @auther kangwei
+ * @create 2025-03-21-14:22
+ */
+@Data
+@ApiModel(value="ReportTargetStatisticsVO ", description="运营目标报表分析对象")
+public class ReportTargetStatisticsVO {
+
+    @ApiModelProperty(value = "机构ID")
+    private String departId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String departName;
+
+
+    @ApiModelProperty(value = "年目标")
+    private String yearTarget;
+
+    @ApiModelProperty(value = "年完成值")
+    private String yearValue;
+
+    @ApiModelProperty(value = "年度完成比例")
+    private String yearWcBL;
+
+    @ApiModelProperty(value = "月目标")
+    private String monthTarget;
+
+    @ApiModelProperty(value = "月完成值")
+    private String monthValue;
+
+    @ApiModelProperty(value = "月度完成比例")
+    private String monthWcBL;
+
+    @ApiModelProperty(value = "数据列表")
+    private List<ReportTargetStatisticsVO> dataList = null;
+
+
+
+    public ReportTargetStatisticsVO() {
+    }
+
+    public ReportTargetStatisticsVO(String yearTarget, String yearValue, String monthTarget, String monthValue) {
+        this.yearTarget = yearTarget;
+        this.yearValue = yearValue;
+        String expression = "100 * ( "+yearValue+"/"+yearTarget+" )";
+        this.yearWcBL = JSUtils.executeExpression(expression,"0.00");
+        this.monthTarget = monthTarget;
+        this.monthValue = monthValue;
+        expression = "100 * ( "+monthValue+"/"+monthTarget+" )";
+        this.monthWcBL = JSUtils.executeExpression(expression,"0.00");
+    }
+}