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.controller;
+
+import com.skua.core.api.vo.Result;
+import com.skua.core.context.BaseContextHandler;
+import com.skua.modules.statistics.service.IReportTargetStatisticsService;
+import com.skua.modules.statistics.vo.ReportTargetEnergyVO;
+import com.skua.modules.statistics.vo.ReportTargetStatisticsVO;
+import com.skua.modules.system.entity.SysDepart;
+import com.skua.modules.system.service.ISysDepartService;
+import com.skua.tool.util.JSUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @auther kangwei
+ * @create 2025-03-21-14:17
+ */
+@Slf4j
+@Api(tags = "/经营目标报表分析")
+@RestController
+@RequestMapping("/web/reportTarget/statistics")
+public class ReportTargetStatisticsController {
+
+    @Autowired
+    private IReportTargetStatisticsService targetStatisticsService;
+
+    @Autowired
+    private ISysDepartService departService;
+
+
+    @ApiOperation(value = "水量经营分析", notes = "水量经营分析")
+    @GetMapping(value = "/targetWaterStatistics")
+    public Result<ReportTargetStatisticsVO> targetWaterStatistics(String departId,String year,String startTime, String endTime) {
+        Result<ReportTargetStatisticsVO> result = new Result<>();
+        try {
+            String departIds = BaseContextHandler.getDeparts();
+            if(StringUtils.isNotEmpty(departId)){
+                departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),departId,"1");
+            }
+            ReportTargetStatisticsVO targetStatisticsVO = targetStatisticsService.targetWaterStatistics(departIds,year,startTime,endTime);
+
+            SysDepart depart = departService.getById("1892199062790823936");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1892199062790823936","1");
+            ReportTargetStatisticsVO targetStatisticsVO_nj = targetStatisticsService.targetWaterStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_nj.setDepartName(depart.getDepartName()); targetStatisticsVO_nj.setDepartId(depart.getId());
+
+            depart = departService.getById("1892199890272477184");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1892199890272477184","1");
+            ReportTargetStatisticsVO targetStatisticsVO_wh = targetStatisticsService.targetWaterStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_wh.setDepartName(depart.getDepartName()); targetStatisticsVO_wh.setDepartId(depart.getId());
+
+            depart = departService.getById("1818215543140909056");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1818215543140909056","1");
+            ReportTargetStatisticsVO targetStatisticsVO_ef = targetStatisticsService.targetWaterStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_ef.setDepartName(depart.getDepartName()); targetStatisticsVO_ef.setDepartId(depart.getId());
+
+            List<ReportTargetStatisticsVO> dataList = new ArrayList<>();
+            dataList.add( targetStatisticsVO_nj);
+            dataList.add(targetStatisticsVO_wh );
+            dataList.add(targetStatisticsVO_ef );
+
+            targetStatisticsVO.setDataList( dataList );
+            result.setSuccess(true);
+            result.setResult(targetStatisticsVO);
+        } catch (Exception e) {
+            log.error("水量经营分析", e.getMessage());
+            result.error500("水量经营分析");
+        }
+        return result;
+    }
+
+    @ApiOperation(value = "水量经营分析-列表", notes = "水量经营分析-列表")
+    @GetMapping(value = "/targetWaterStatisticsList")
+    public Result<List<ReportTargetStatisticsVO>> targetWaterStatisticsList(String departId,String year,String startTime, String endTime) {
+        Result<List<ReportTargetStatisticsVO>> result = new Result<>();
+        try {
+            String departIds = BaseContextHandler.getDeparts();
+            if(StringUtils.isNotEmpty(departId)){
+                departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),departId,"1");
+            }
+            List<ReportTargetStatisticsVO> dataList = targetStatisticsService.targetWaterStatisticsList(departIds,year,startTime,endTime);
+            result.setSuccess(true);
+            result.setResult(dataList);
+        } catch (Exception e) {
+            log.error("水量经营分析-列表", e.getMessage());
+            result.error500("水量经营分析-列表");
+        }
+        return result;
+    }
+
+
+    @ApiOperation(value = "能耗经营分析", notes = "能耗经营分析")
+    @GetMapping(value = "/targetEnergyStatistics")
+    public Result<ReportTargetEnergyVO> targetEnergyStatistics(String departId,String year,String startTime, String endTime) {
+        Result<ReportTargetEnergyVO> result = new Result<>();
+        try {
+            String departIds = BaseContextHandler.getDeparts();
+            if(StringUtils.isNotEmpty(departId)){
+                departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),departId,"1");
+            }
+            ReportTargetEnergyVO targetStatisticsVO = targetStatisticsService.targetEnergyStatistics(departIds,year,startTime,endTime);
+
+            SysDepart depart = departService.getById("1892199062790823936");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1892199062790823936","1");
+            ReportTargetEnergyVO targetStatisticsVO_nj = targetStatisticsService.targetEnergyStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_nj.setDepartName(depart.getDepartName()); targetStatisticsVO_nj.setDepartId(depart.getId());
+
+            depart = departService.getById("1892199890272477184");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1892199890272477184","1");
+            ReportTargetEnergyVO targetStatisticsVO_wh = targetStatisticsService.targetEnergyStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_wh.setDepartName(depart.getDepartName()); targetStatisticsVO_wh.setDepartId(depart.getId());
+
+            depart = departService.getById("1818215543140909056");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1818215543140909056","1");
+            ReportTargetEnergyVO targetStatisticsVO_ef = targetStatisticsService.targetEnergyStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_ef.setDepartName(depart.getDepartName()); targetStatisticsVO_ef.setDepartId(depart.getId());
+
+            List<ReportTargetEnergyVO> dataList = new ArrayList<>();
+            dataList.add( targetStatisticsVO_nj);
+            dataList.add(targetStatisticsVO_wh );
+            dataList.add(targetStatisticsVO_ef );
+
+            targetStatisticsVO.setDataList( dataList );
+            result.setSuccess(true);
+            result.setResult(targetStatisticsVO);
+        } catch (Exception e) {
+            log.error("分析经营分析", e.getMessage());
+            result.error500("费用经营分析"+e.getMessage());
+        }
+        return result;
+    }
+
+    @ApiOperation(value = "能耗经营分析-列表", notes = "能耗经营分析-列表")
+    @GetMapping(value = "/targetEnergyStatisticsList")
+    public Result<List<ReportTargetEnergyVO>> targetEnergyStatisticsList(String departId, String year, String startTime, String endTime) {
+        Result<List<ReportTargetEnergyVO>> result = new Result<>();
+        try {
+            String departIds = BaseContextHandler.getDeparts();
+            if(StringUtils.isNotEmpty(departId)){
+                departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),departId,"1");
+            }
+            List<ReportTargetEnergyVO> dataList = targetStatisticsService.targetEnergyStatisticsList(departIds,year,startTime,endTime);
+            result.setSuccess(true);
+            result.setResult(dataList);
+        } catch (Exception e) {
+            log.error("能耗经营分析-列表", e.getMessage());
+            result.error500("能耗经营分析-列表");
+        }
+        return result;
+    }
+
+
+
+
+
+    @ApiOperation(value = "费用经营分析", notes = "费用经营分析")
+    @GetMapping(value = "/targetCostStatistics")
+    public Result<ReportTargetStatisticsVO> targetCostStatistics(String departId,String year,String startTime, String endTime) {
+        Result<ReportTargetStatisticsVO> result = new Result<>();
+        try {
+            String departIds = BaseContextHandler.getDeparts();
+            if(StringUtils.isNotEmpty(departId)){
+                departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),departId,"1");
+            }
+            ReportTargetStatisticsVO targetStatisticsVO = targetStatisticsService.targetCostStatistics(departIds,year,startTime,endTime);
+
+            SysDepart depart = departService.getById("1892199062790823936");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1892199062790823936","1");
+            ReportTargetStatisticsVO targetStatisticsVO_nj = targetStatisticsService.targetCostStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_nj.setDepartName(depart.getDepartName()); targetStatisticsVO_nj.setDepartId(depart.getId());
+
+            depart = departService.getById("1892199890272477184");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1892199890272477184","1");
+            ReportTargetStatisticsVO targetStatisticsVO_wh = targetStatisticsService.targetCostStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_wh.setDepartName(depart.getDepartName()); targetStatisticsVO_wh.setDepartId(depart.getId());
+
+            depart = departService.getById("1818215543140909056");
+            departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),"1818215543140909056","1");
+            ReportTargetStatisticsVO targetStatisticsVO_ef = targetStatisticsService.targetCostStatistics(departIds,year,startTime,endTime);
+            targetStatisticsVO_ef.setDepartName(depart.getDepartName()); targetStatisticsVO_ef.setDepartId(depart.getId());
+
+            List<ReportTargetStatisticsVO> dataList = new ArrayList<>();
+            dataList.add( targetStatisticsVO_nj);
+            dataList.add(targetStatisticsVO_wh );
+            dataList.add(targetStatisticsVO_ef );
+
+            targetStatisticsVO.setDataList( dataList );
+            result.setSuccess(true);
+            result.setResult(targetStatisticsVO);
+        } catch (Exception e) {
+            log.error("费用经营分析", e.getMessage());
+            result.error500("费用经营分析");
+        }
+        return result;
+    }
+
+    @ApiOperation(value = "费用经营分析-列表", notes = "费用经营分析-列表")
+    @GetMapping(value = "/targetCostStatisticsList")
+    public Result<List<ReportTargetStatisticsVO>> targetCostStatisticsList(String departId,String year,String startTime, String endTime) {
+        Result<List<ReportTargetStatisticsVO>> result = new Result<>();
+        try {
+            String departIds = BaseContextHandler.getDeparts();
+            if(StringUtils.isNotEmpty(departId)){
+                departIds = departService.getChildDepartId(BaseContextHandler.getDeparts(),departId,"1");
+            }
+            List<ReportTargetStatisticsVO> dataList = targetStatisticsService.targetCostStatisticsList(departIds,year,startTime,endTime);
+            result.setSuccess(true);
+            result.setResult(dataList);
+        } catch (Exception e) {
+            log.error("费用经营分析-列表", e.getMessage());
+            result.error500("费用经营分析-列表");
+        }
+        return result;
+    }
+
+}

+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.service.impl;
+
+import com.skua.common.constant.ReportConstant;
+import com.skua.common.report.ReportViewUtil;
+import com.skua.core.context.SpringContextUtils;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.statistics.service.IReportTargetStatisticsService;
+import com.skua.modules.statistics.vo.ReportTargetEnergyVO;
+import com.skua.modules.statistics.vo.ReportTargetStatisticsVO;
+import com.skua.tool.util.DateUtils;
+import com.skua.tool.util.JSUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther kangwei
+ * @create 2025-03-21-14:19
+ */
+@Service("IReportTargetStatisticsService")
+public class ReportTargetStatisticsServiceImpl  implements IReportTargetStatisticsService {
+
+    /***
+     *   水量经营分析
+     * @param departIds
+     * @param year
+     * @param endTime
+     * @return
+     */
+    public ReportTargetStatisticsVO  targetWaterStatistics(String departIds,String year ,String startTime,String endTime ){
+        String sql = "select ifnull(sum(t.target_water),0) target_water from report_target_config t where t.target_year = '"+year+"' and t.depart_id  in ( "+JSUtils.quoteEach(departIds,",")+")";
+        String yearTarget = getJdbcTemplate().queryForObject(sql,String.class);
+        sql ="select  ifnull(SUM(target_value),0) FROM report_target_config_sub WHERE target_type = 'SL' AND target_time= '"+ DateUtils.formatDate(startTime,"yyyy-MM") +"' AND depart_id in ("+JSUtils.quoteEach(departIds,",")+")";
+        String monthTarget = getJdbcTemplate().queryForObject(sql,String.class);
+
+        String  dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, year+"-01-01",year+"-12-31");
+        sql = "select  round(ifnull(sum(aaa.CSL)/10000,0),2) 'CSL'  from  "+  dataViewName2119 + "  aaa";
+        String yearValue = getJdbcTemplate().queryForObject(sql,String.class);
+
+        dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, startTime,endTime);
+        sql = "select  round(ifnull(sum(aaa.CSL)/10000,0),2) 'CSL'  from  "+  dataViewName2119 + "  aaa";
+        String monthValue = getJdbcTemplate().queryForObject(sql,String.class);
+
+        ReportTargetStatisticsVO targetStatisticsVO = new ReportTargetStatisticsVO(yearTarget,  yearValue,  monthTarget,  monthValue);
+        return targetStatisticsVO;
+    }
+
+    public List<ReportTargetStatisticsVO>  targetWaterStatisticsList(String departIds,String year ,String startTime,String endTime){
+        String month = DateUtils.formatDate(startTime,"yyyy-MM");
+        String  dataViewName2119_year = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, year+"-01-01",year+"-12-31");
+        String  dataViewName2119_month = ReportViewUtil.buildView(ReportConstant.view2119,"CSL", departIds, startTime,endTime);
+
+        String sql = " select d.depart_name ,ifnull(tc.target_water,0) 'yearTarget' ,ifnull(tcs.target_value,0) 'monthTarget',ifnull(ccc.CSL,0) 'yearValue',ifnull(ddd.CSL,0) 'monthValue'  from sys_depart d ";
+        sql += " left join  report_target_config tc on (tc.depart_id  = d.id and tc.target_year  = '"+year+"') ";
+        sql += " left join report_target_config_sub tcs on (tcs.depart_id = d.id and  target_type = 'SL' AND target_time= '"+month+"') ";
+        sql += " left join(  select  aaa.depart_id, round(ifnull(sum(aaa.CSL)/10000,0),2) 'CSL'  from " + dataViewName2119_year+"aaa  group by aaa.depart_id ) ccc on ccc.depart_id  = d.id ";
+        sql += " left join(  select  aaa.depart_id, round(ifnull(sum(aaa.CSL)/10000,0),2) 'CSL'  from " + dataViewName2119_month+"aaa  group by aaa.depart_id ) ddd on ddd.depart_id  = d.id  ";
+        sql += "  where d.depart_type = 1 ";
+        if(StringUtils.isNotEmpty(departIds)){
+        sql += "    and d.id  in ("+departIds+") ";
+        }
+        sql += "order by ccc.CSL desc ";
+        List<ReportTargetStatisticsVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetStatisticsVO.class));
+        return dataList;
+    }
+    /***
+     *   能耗经营分析
+     * @param departIds
+     * @param year
+     * @param
+     * @return
+     */
+    public ReportTargetEnergyVO targetEnergyStatistics(String departIds, String year , String startTime, String endTime){
+        String sql = "select round(ifnull(avg(target_power),0),2) target_power,round(ifnull(avg(target_drug),0),2) target_drug  from report_target_config t where t.target_year = '"+year+"' and t.depart_id  in ( "+JSUtils.quoteEach(departIds,",")+")";
+        Map<String, Object> targetMap = getJdbcTemplate().queryForMap(sql);
+
+        String  dataViewName4411_year = ReportViewUtil.buildView(ReportConstant.view4411,"bnsjyh,bnsjdh", departIds, year+"-01",year+"-12") ;
+        sql = " select  round(ifnull(avg(aaa.bnsjyh),0),2) 'dsyf',round(ifnull(avg(aaa.bnsjdh),0),2) 'dsdf'   from  "+dataViewName4411_year +"  aaa" ;
+        Map<String, Object> dataMap = getJdbcTemplate().queryForMap(sql);
+
+        ReportTargetEnergyVO  targetEnergyVO = new ReportTargetEnergyVO(ConvertUtils.getString(targetMap.get("target_power"),"0"),ConvertUtils.getString(dataMap.get("dsdf"),"0"),
+                ConvertUtils.getString(targetMap.get("target_drug"),"0"),ConvertUtils.getString(dataMap.get("dsdf"),"0"));
+        return targetEnergyVO;
+    }
+    public List<ReportTargetEnergyVO>  targetEnergyStatisticsList(String departIds,String year ,String startTime,String endTime){
+        String month = DateUtils.formatDate(startTime,"yyyy-MM");
+        String  dataViewName4411_month = ReportViewUtil.buildView(ReportConstant.view4411,"yyh,ydh", departIds, month,month) ;
+
+        String sql = " select  d.depart_name , tc.target_power 'dsdfYearTarget',tc.target_drug 'dsyfYearTarget', ifnull(bbb.yyh,0) 'dsyfValue'  , ifnull(bbb.ydh,0) 'dsdfValue' from sys_depart d  ";
+        sql += " left join  report_target_config tc on (tc.depart_id  = d.id and tc.target_year  = '"+year+"' ) ";
+        sql += " left join (  select aaa.depart_id , round(ifnull(avg(aaa.yyh),0),2) yyh ,round(ifnull(avg(aaa.ydh),0),2) ydh  from "+dataViewName4411_month+" aaa group by aaa.depart_id  )bbb on bbb.depart_id = d.id";
+        sql += "  where d.depart_type = 1 ";
+        if(StringUtils.isNotEmpty(departIds)){
+            sql += "    and d.id  in ("+departIds+") ";
+        }
+        List<ReportTargetEnergyVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetEnergyVO.class));
+        return dataList;
+    }
+    /***
+     *   水量经营分析
+     * @param departIds
+     * @param year
+     * @param
+     * @return
+     */
+    public ReportTargetStatisticsVO  targetCostStatistics(String departIds,String year ,String startTime,String endTime){
+        String month = DateUtils.formatDate(startTime,"yyyy-MM");
+
+        String sql = "select ifnull(sum(t.target_cost),0) target_cost from report_target_config t where t.target_year = '"+year+"' and t.depart_id  in ( "+ JSUtils.quoteEach(departIds,",")+")";
+        String yearTarget = getJdbcTemplate().queryForObject(sql,String.class);
+
+        sql ="select  ifnull(SUM(target_value),0) FROM report_target_config_sub WHERE target_type = 'fy' AND target_time= '"+ DateUtils.formatDate(startTime,"yyyy-MM") +"' AND depart_id in ("+JSUtils.quoteEach(departIds,",")+")";
+        String monthTarget = getJdbcTemplate().queryForObject(sql,String.class);
+
+        String  dataViewName4411_year = ReportViewUtil.buildView(ReportConstant.view4411,"ysjsf", departIds, year+"-01-01",year+"-12-31");
+        sql = "select  round(ifnull(sum(aaa.ysjsf)/10000,0),2) 'ysjsf'  from  "+  dataViewName4411_year + "  aaa";
+        String yearValue = getJdbcTemplate().queryForObject(sql,String.class);
+
+        String  dataViewName4411_month = ReportViewUtil.buildView(ReportConstant.view4411,"ysjsf", departIds, month,month) ;
+        sql = "select  round(ifnull(sum(aaa.ysjsf)/10000,0),2) 'ysjsf'  from  "+  dataViewName4411_month + "  aaa";
+        String monthValue = getJdbcTemplate().queryForObject(sql,String.class);
+
+        ReportTargetStatisticsVO targetStatisticsVO = new ReportTargetStatisticsVO(yearTarget,  yearValue,  monthTarget,  monthValue);
+        return targetStatisticsVO;
+    }
+
+    public List<ReportTargetStatisticsVO>  targetCostStatisticsList(String departIds,String year ,String startTime,String endTime){
+        String month = DateUtils.formatDate(startTime,"yyyy-MM");
+        String  dataViewName4411_year = ReportViewUtil.buildView(ReportConstant.view4411,"ysjsf", departIds, year+"-01-01",year+"-12-31");
+        String  dataViewName4411_month = ReportViewUtil.buildView(ReportConstant.view4411,"ysjsf", departIds, month,month) ;
+
+        String sql = " select d.depart_name ,ifnull(tc.target_cost,0) 'yearTarget' ,ifnull(tcs.target_value,0) 'monthTarget',ifnull(ccc.ysjsf,0) 'yearValue',ifnull(ddd.ysjsf,0) 'monthValue'  from sys_depart d ";
+        sql += " left join  report_target_config tc on (tc.depart_id  = d.id and tc.target_year  = '"+year+"') ";
+        sql += " left join report_target_config_sub tcs on (tcs.depart_id = d.id and  target_type = 'fy' AND target_time= '"+month+"') ";
+
+        sql += " left join(  select  aaa.depart_id, round(ifnull(sum(aaa.ysjsf)/10000,0),2) 'ysjsf'  from " + dataViewName4411_year+"aaa  group by aaa.depart_id ) ccc on ccc.depart_id  = d.id ";
+        sql += " left join(  select  aaa.depart_id, round(ifnull(sum(aaa.ysjsf)/10000,0),2) 'ysjsf'  from " + dataViewName4411_month+"aaa  group by aaa.depart_id ) ddd on ddd.depart_id  = d.id  ";
+        sql += "  where d.depart_type = 1 ";
+        if(StringUtils.isNotEmpty(departIds)){
+            sql += "    and d.id  in ("+departIds+") ";
+        }
+        List<ReportTargetStatisticsVO> dataList = getJdbcTemplate().query(sql,new BeanPropertyRowMapper<>(ReportTargetStatisticsVO.class));
+        return dataList;
+    }
+
+    private JdbcTemplate getJdbcTemplate(){
+        JdbcTemplate jdbcTemplate = (JdbcTemplate) SpringContextUtils.getBean("master");
+        return jdbcTemplate;
+    }
+}

+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");
+    }
+}