kangwei: 指挥中心---药耗分析

                --- 维修费用飞行
          重点事项推进情况-后端

@@ -318,10 +318,15 @@ public class ReportViewUtil {
 	 * @return
 	 * @return
 	 */
 	 */
 	public  static ReportItemVO getSumValueByTBHB(String reportId, String fields, String departIds , String startTime , String endTime){
 	public  static ReportItemVO getSumValueByTBHB(String reportId, String fields, String departIds , String startTime , String endTime){
+		return getSumValueByTBHB(reportId,  fields,  departIds ,  startTime ,  endTime,null);
+	}
+
+
+	public  static ReportItemVO getSumValueByTBHB(String reportId, String fields, String departIds , String startTime , String endTime,String operatorSign){
 		ReportItemVO reportItemVO = null;
 		ReportItemVO reportItemVO = null;
-		String dataViewName3a24_value = ReportViewUtil.buildViewLike(reportId,fields, departIds, startTime,endTime);
-		String dataViewName3a24_valueHB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getHbDate(startTime),DateUtils.getHbDate(endTime));
-		String dataViewName3a24_valueTB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getTbDate(startTime),DateUtils.getTbDate(endTime));
+		String dataViewName3a24_value = ReportViewUtil.buildViewLike(reportId,fields, departIds, startTime,endTime,operatorSign);
+		String dataViewName3a24_valueHB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getHbDate(startTime),DateUtils.getHbDate(endTime),operatorSign);
+		String dataViewName3a24_valueTB = ReportViewUtil.buildViewLike(reportId,fields, departIds, DateUtils.getTbDate(startTime),DateUtils.getTbDate(endTime),operatorSign);
 
 
 		String fieldsSql = "";
 		String fieldsSql = "";
 		if(StringUtils.isNotEmpty(fields)) {
 		if(StringUtils.isNotEmpty(fields)) {
@@ -347,8 +352,6 @@ public class ReportViewUtil {
 		return reportItemVO;
 		return reportItemVO;
 	}
 	}
 
 
-
-
 	public  static String getValueByDSDH( String departIds , String startTime , String endTime){
 	public  static String getValueByDSDH( String departIds , String startTime , String endTime){
 
 
 		String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ", departIds, startTime,endTime);
 		String dataViewName3a24 = ReportViewUtil.buildViewLike(ReportConstant.view3a24,"DLHJ", departIds, startTime,endTime);

@@ -8,6 +8,7 @@ import com.skua.core.util.ConvertUtils;
 import com.skua.modules.algorithm.vo.DepartLoadRateResultVO;
 import com.skua.modules.algorithm.vo.DepartLoadRateResultVO;
 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
 import com.skua.modules.common.vo.DateVO;
 import com.skua.modules.common.vo.DateVO;
+import com.skua.modules.equipment.vo.DrugConsumptionDisplayVO;
 import com.skua.modules.quartz.util.BaseUtil;
 import com.skua.modules.quartz.util.BaseUtil;
 import com.skua.modules.report.vo.DepartLoadRateVO;
 import com.skua.modules.report.vo.DepartLoadRateVO;
 import com.skua.modules.report.vo.FRportlCommandCenterVO;
 import com.skua.modules.report.vo.FRportlCommandCenterVO;
@@ -58,7 +59,7 @@ public class ReportItemvService {
         long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
         long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
 
 
         //当月数据/环比、同比
         //当月数据/环比、同比
-        FRportlCommandCenterVO  nowMonthVO = new FRportlCommandCenterVO("月总数据(", JSUtils.format(nowMonthValue), JSUtils.format(lastMonthValue),  JSUtils.format(lastYearValue));
+        FRportlCommandCenterVO  nowMonthVO = new FRportlCommandCenterVO("月总数据", JSUtils.format(nowMonthValue), JSUtils.format(lastMonthValue),  JSUtils.format(lastYearValue));
         //日均数据：/环比/同比
         //日均数据：/环比/同比
         FRportlCommandCenterVO  lastMonthVO = new FRportlCommandCenterVO("日均数据",JSUtils.divide( nowMonthValue ,nowDifferDay ) ,JSUtils.divide( lastMonthValue ,lastMonthDifferDay ),JSUtils.divide( lastYearValue ,lastYearDifferDay ) );
         FRportlCommandCenterVO  lastMonthVO = new FRportlCommandCenterVO("日均数据",JSUtils.divide( nowMonthValue ,nowDifferDay ) ,JSUtils.divide( lastMonthValue ,lastMonthDifferDay ),JSUtils.divide( lastYearValue ,lastYearDifferDay ) );
         //吨水消耗=万吨水产泥量
         //吨水消耗=万吨水产泥量
@@ -365,19 +366,22 @@ public class ReportItemvService {
     }
     }
 
 
     public List<FRportlCommandCenterVO> statisticsByYh(String departIds, String startDate, String endDate) {
     public List<FRportlCommandCenterVO> statisticsByYh(String departIds, String startDate, String endDate) {
-        String startDateTb = DateUtils.getTbDate(startDate);
-        String endDateTb = DateUtils.getTbDate(endDate);
-        String startDateHb = DateUtils.getHbDate(startDate);
-        String endDateHb = DateUtils.getHbDate(endDate);
-        //药剂SQL
-        String dataViewName3a24 = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDate, endDate);
-        String dataViewName3a24Tb = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDateTb, endDateTb);
-        String dataViewName3a24Hb = ReportViewUtil.buildView(ReportConstant.view3a24, ReportConstant.fieldYj, departIds, startDateHb, endDateHb);
-        //处理水量
-        String dataViewName2119 = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, startDate, endDate);
-        String dataViewName2119Tb = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, startDateTb, endDateTb);
-        String dataViewName2119Hb = ReportViewUtil.buildView(ReportConstant.view2119, ReportConstant.fieldClsl, departIds, startDateHb, endDateHb);
-
+        //出水量：+同比+环比
+        ReportItemVO csl_reportVO = ReportViewUtil.getSumValueByTBHB(ReportConstant.view2119,ReportConstant.field_CSL, departIds, startDate, endDate);
+        //总药耗：value ; 同比  环比
+        ReportItemVO  zyhReportVO = ReportViewUtil.getSumValueByTBHB( ReportConstant.view3a24,ReportConstant.fieldYj, departIds, startDate,endDate);
+        //日均药耗  value ，同比，环比
+        ReportItemVO  zyhReportAVG = ReportViewUtil.getSumValueByTBHB( ReportConstant.view3a24,ReportConstant.fieldYj, departIds, startDate,endDate,"avg");
+
+        //计算药耗
+        DrugConsumptionDisplayVO   displayVO = new DrugConsumptionDisplayVO(ConvertUtils.getDouble(csl_reportVO.getValue(),0d) , ConvertUtils.getDouble(csl_reportVO.getValueHb(),0d), ConvertUtils.getDouble(csl_reportVO.getValueTb(),0d),
+                ConvertUtils.getDouble(zyhReportVO.getValue(),0d),  ConvertUtils.getDouble(zyhReportVO.getValueHb(),0d),  ConvertUtils.getDouble(zyhReportVO.getValueTb(),0d));
+
+        List<FRportlCommandCenterVO> dataList = new ArrayList<>();
+
+        dataList.add( new FRportlCommandCenterVO("月总药耗" ,zyhReportVO.getValue(),zyhReportVO.getValueTb(),zyhReportVO.getValueHb())  );
+        dataList.add( new FRportlCommandCenterVO("日均药耗" ,zyhReportAVG.getValue(),zyhReportAVG.getValueTb(),zyhReportAVG.getValueHb())  );
+        dataList.add( new FRportlCommandCenterVO("吨水药耗" ,displayVO.getDsyh()+"",displayVO.getTbqndsyh()+"",displayVO.getHbsydsyh()+"")  );
         return null;
         return null;
     }
     }
 }
 }

@@ -11,6 +11,7 @@ import com.skua.modules.algorithm.vo.DepartLoadRateResultVO;
 import com.skua.modules.algorithm.vo.StackedAreaChartDataVO;
 import com.skua.modules.algorithm.vo.StackedAreaChartDataVO;
 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
 import com.skua.modules.common.vo.DateVO;
 import com.skua.modules.common.vo.DateVO;
+import com.skua.modules.equipment.vo.EquipmentRepairAnalysisVO;
 import com.skua.modules.guest.util.DateUtil;
 import com.skua.modules.guest.util.DateUtil;
 import com.skua.modules.report.vo.DepartDrugResult;
 import com.skua.modules.report.vo.DepartDrugResult;
 import com.skua.modules.report.vo.FRportlCommandCenterVO;
 import com.skua.modules.report.vo.FRportlCommandCenterVO;
@@ -33,6 +34,7 @@ import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 统计功能配置表
  * 统计功能配置表
@@ -338,7 +340,17 @@ public class SysCommandCentreController {
         return result;
         return result;
     }
     }
 
 
-
+    //EquipmentRepairAnalysisVO
+    @AutoLog(value = "指挥中心-设备维修维护费用统计")
+    @ApiOperation(value="指挥中心-设备维修维护费用统计", notes="指挥中心-设备维修维护费用统计")
+    @GetMapping(value = "/statisticsBySbwx")
+    public Result<Map<String,Object>> equipmentRepairAnalysis(String startDate, String endDate) {
+        Map<String,Object> dataMap = commandCentreService.equipmentRepairAnalysis(startDate,endDate);
+        Result<Map<String,Object>> result = new Result<>();
+        result.setSuccess(true);
+        result.setResult(dataMap);
+        return result;
+    }
 
 
     /**
     /**
      * 获取时间之间的月份
      * 获取时间之间的月份

@@ -3,6 +3,8 @@ package com.skua.modules.dataAnalysis.service;
 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
 import com.skua.modules.report.vo.*;
 import com.skua.modules.report.vo.*;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+
 /**
 /**
  * <pre>
  * <pre>
  * 指挥中心实现逻辑
  * 指挥中心实现逻辑
@@ -31,4 +33,13 @@ public interface ICommandCentreService {
      * @return
      * @return
      */
      */
     List<WaterTreatmentVO> statisticsCLSLXQ(String startDate,String endDate ,String departIds);
     List<WaterTreatmentVO> statisticsCLSLXQ(String startDate,String endDate ,String departIds);
+
+
+    /***
+     * 指挥中心----设备维修维护费用分析
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    Map<String, Object> equipmentRepairAnalysis(String startDate, String endDate);
 }
 }

@@ -7,6 +7,7 @@ import com.skua.core.util.ConvertUtils;
 import com.skua.modules.dataAnalysis.service.ICommandCentreService;
 import com.skua.modules.dataAnalysis.service.ICommandCentreService;
 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
 import com.skua.modules.algorithm.vo.WaterTreatmentVO;
 import com.skua.modules.common.vo.DateVO;
 import com.skua.modules.common.vo.DateVO;
+import com.skua.modules.equipment.vo.EquipmentRepairAnalysisVO;
 import com.skua.modules.quartz.util.BaseUtil;
 import com.skua.modules.quartz.util.BaseUtil;
 import com.skua.modules.report.vo.*;
 import com.skua.modules.report.vo.*;
 import com.skua.modules.report.mapper.FReportItemvMapper;
 import com.skua.modules.report.mapper.FReportItemvMapper;
@@ -65,10 +66,7 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
     }
     }
 
 
 
 
-    private JdbcTemplate getJdbcTemplate(){
-        JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
-        return masterDB;
-    }
+
     /***
     /***
      * 指挥中心----运行负荷率分析----处理水量详情
      * 指挥中心----运行负荷率分析----处理水量详情
      * @param
      * @param
@@ -126,6 +124,35 @@ public class CommandCentreServiceImpl implements ICommandCentreService {
         }
         }
         return dateList;
         return dateList;
     }
     }
+
+    /***
+     * 指挥中心----设备维修维护费用分析
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    public Map<String, Object> equipmentRepairAnalysis(String startDate, String endDate){
+        Map<String, Object> dataMap  = new HashMap<>();
+        startDate = startDate+" 00:00:00";
+        endDate = endDate+" 23:59:59";
+        String sql = "select  round( ifnull(sum( er.total_cost),0) ,2) 'cost' from equipment_repair er  where er.reality_maintenance_end_time >='"+startDate+"' and  er.reality_maintenance_end_time <='"+endDate+"'";
+        String totalCost = getJdbcTemplate().queryForObject(sql,String.class);
+        sql = "select aaa.* from ( select  er.depart_id,d.depart_name, ei.equipment_name,er.fault_content,er.fault_library_id ,ei.equipment_level  from equipment_repair er ";
+        sql += " left join equipment_info  ei on er.info_id = ei.id ";
+        sql +=" left join sys_depart d on d.id = er.depart_id";
+        sql += " where  er.reality_maintenance_end_time >='"+startDate+"' and  er.reality_maintenance_end_time <='"+endDate+"' ) aaa";
+        sql += " where aaa.equipment_level = '6bf727eb7e7cca6a95c694dab0036b2c'";//A类设备
+        List<EquipmentRepairAnalysisVO> dataList =  getJdbcTemplate().query(sql,new BeanPropertyRowMapper<EquipmentRepairAnalysisVO>(EquipmentRepairAnalysisVO.class));;
+
+        dataMap.put("totalCost",totalCost);
+        dataMap.put("dataList",dataList);
+        return dataMap;
+    }
+    private JdbcTemplate getJdbcTemplate(){
+        JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
+        return masterDB;
+    }
+
     //通用csl查询，返回Map<部门编号，CSL出水量>
     //通用csl查询，返回Map<部门编号，CSL出水量>
     public  Map<String,String> commonQueryCsl(String departIds ,String startTime ,String endTime){
     public  Map<String,String> commonQueryCsl(String departIds ,String startTime ,String endTime){
         Map<String,String> cslMap = new HashMap<>();
         Map<String,String> cslMap = new HashMap<>();

+package com.skua.modules.report.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.skua.core.api.vo.Result;
+import com.skua.core.aspect.annotation.AutoLog;
+import com.skua.core.context.BaseContextHandler;
+import com.skua.core.query.QueryGenerator;
+import com.skua.core.service.ISequenceService;
+import com.skua.core.util.ConvertUtils;
+import com.skua.modules.report.entity.MajorIssuesProcess;
+import com.skua.modules.report.entity.MajorIssuesProcessItem;
+import com.skua.modules.report.service.IMajorIssuesProcessItemService;
+import com.skua.modules.report.service.IMajorIssuesProcessService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <pre>
+ * 重点事项推进情况
+ * </pre>
+ * @author 开发者姓名
+ * @version V0.1, 开发时间
+ */
+@Slf4j
+@Api(tags="重点事项推进情况")
+@RestController("webMajorIssuesProcessController")
+@RequestMapping("/web/report/majorIssuesProcess")
+public class MajorIssuesProcessController {
+	@Autowired
+	private IMajorIssuesProcessService majorIssuesProcessService;
+	@Autowired
+	private IMajorIssuesProcessItemService majorIssuesProcessItemService;
+
+	@AutoLog(value = "重点事项推进情况-分页列表查询")
+	@ApiOperation(value="重点事项推进情况-分页列表查询", notes="重点事项推进情况-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<MajorIssuesProcess>> queryPageList(MajorIssuesProcess majorIssuesProcess,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<MajorIssuesProcess>> result = new Result<IPage<MajorIssuesProcess>>();
+		QueryWrapper<MajorIssuesProcess> queryWrapper = QueryGenerator.initQueryWrapper(majorIssuesProcess, req.getParameterMap());
+		Page<MajorIssuesProcess> page = new Page<MajorIssuesProcess>(pageNo, pageSize);
+		IPage<MajorIssuesProcess> pageList = majorIssuesProcessService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	@AutoLog(value = "重点事项推进情况-添加")
+	@ApiOperation(value="重点事项推进情况-添加", notes="重点事项推进情况-添加")
+	@PostMapping(value = "/add")
+	public Result<MajorIssuesProcess> add(@RequestBody MajorIssuesProcess majorIssuesProcess) {
+		Result<MajorIssuesProcess> result = new Result<MajorIssuesProcess>();
+		try {
+			majorIssuesProcessService.save(majorIssuesProcess);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	@AutoLog(value = "重点事项推进情况-编辑")
+	@ApiOperation(value="重点事项推进情况-编辑", notes="重点事项推进情况-编辑")
+	@PutMapping(value = "/edit")
+	public Result<MajorIssuesProcess> edit(@RequestBody MajorIssuesProcess majorIssuesProcess) {
+		Result<MajorIssuesProcess> result = new Result<MajorIssuesProcess>();
+		MajorIssuesProcess majorIssuesProcessEntity = majorIssuesProcessService.getById(majorIssuesProcess.getId());
+		if(majorIssuesProcessEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = majorIssuesProcessService.updateById(majorIssuesProcess);
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		return result;
+	}
+
+	@AutoLog(value = "重点事项推进情况-通过id删除")
+	@ApiOperation(value="重点事项推进情况-通过id删除", notes="重点事项推进情况-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		try {
+			majorIssuesProcessService.removeById(id);
+		} catch (Exception e) {
+			log.error("删除失败",e.getMessage());
+			return Result.error("删除失败!");
+		}
+		return Result.ok("删除成功!");
+	}
+
+
+	@AutoLog(value = "重点事项推进情况-批量删除")
+	@ApiOperation(value="重点事项推进情况-批量删除", notes="重点事项推进情况-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<MajorIssuesProcess> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<MajorIssuesProcess> result = new Result<MajorIssuesProcess>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.majorIssuesProcessService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	@AutoLog(value = "重点事项推进情况-通过id查询")
+	@ApiOperation(value="重点事项推进情况-通过id查询", notes="重点事项推进情况-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<MajorIssuesProcess> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<MajorIssuesProcess> result = new Result<MajorIssuesProcess>();
+		MajorIssuesProcess majorIssuesProcess = majorIssuesProcessService.getById(id);
+		if(majorIssuesProcess==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(majorIssuesProcess);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+	@AutoLog(value = "重点事项推进情况-进展列表")
+	@ApiOperation(value="重点事项推进情况-进展列表", notes="重点事项推进情况-进展列表")
+	@GetMapping(value = "/processList")
+	public Result<List<MajorIssuesProcessItem>> queryProcessListById(@RequestParam(name="id",required=true) String id) {
+		Result<List<MajorIssuesProcessItem>> result = new Result<List<MajorIssuesProcessItem>>();
+		QueryWrapper<MajorIssuesProcessItem> queryWrapper = new  QueryWrapper<MajorIssuesProcessItem>();
+		queryWrapper.eq("matter_process_id",id);
+		queryWrapper.orderByDesc("create_time");
+		List<MajorIssuesProcessItem> dataList   =  majorIssuesProcessItemService.list();
+		result.setResult(dataList);
+		result.setSuccess(true);
+		return result;
+	}
+	@AutoLog(value = "重点事项推进情况-水厂添加进展")
+	@ApiOperation(value="重点事项推进情况-水厂添加进展", notes="重点事项推进情况-水厂添加进展")
+	@PostMapping(value = "/addProcess")
+	public Result<MajorIssuesProcessItem> addProcess(@RequestBody MajorIssuesProcessItem majorIssuesProcessItem) {
+		Result<MajorIssuesProcessItem> result = new Result<MajorIssuesProcessItem>();
+		try {
+			majorIssuesProcessItemService.saveProcess(majorIssuesProcessItem);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+}

+package com.skua.modules.report.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.skua.core.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 重点事项推进情况
+ */
+@Data
+@TableName("f_major_issues_process")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="f_major_issues_process对象", description="重点事项推进情况")
+public class MajorIssuesProcess {
+
+	/**id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**水务公司*/
+	@Excel(name = "水务公司", width = 15)
+    @ApiModelProperty(value = "水务公司")
+	private String departId;
+	/**事项名称*/
+	@Excel(name = "事项名称", width = 15)
+    @ApiModelProperty(value = "事项名称")
+	private String matterName;
+	/**立项时间*/
+	@Excel(name = "立项时间", width = 15)
+    @ApiModelProperty(value = "立项时间")
+	private String startTime;
+	/**完成时间节点*/
+	@Excel(name = "完成时间节点", width = 15)
+    @ApiModelProperty(value = "完成时间节点")
+	private String endTime;
+	/**推进频率*/
+	@Excel(name = "推进频率", width = 15)
+    @ApiModelProperty(value = "推进频率")
+	private Integer cycle;
+	@ApiModelProperty(value = "循环周期单位")
+	@Dict(dicCode = "loop_unit")
+	private String cycleUnit;
+	/**预估金额*/
+	@Excel(name = "预估金额", width = 15)
+    @ApiModelProperty(value = "预估金额")
+	private String estimateMoney;
+	/**解决措施*/
+	@Excel(name = "解决措施", width = 15)
+    @ApiModelProperty(value = "解决措施")
+	private String handleMeasures;
+	/**当前进展*/
+	@Excel(name = "当前进展", width = 15)
+    @ApiModelProperty(value = "当前进展")
+	private String currentProgress;
+
+	@ApiModelProperty(value = "最近进展时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private Date currentProgressTime;
+	/**创建人id*/
+	@Excel(name = "创建人id", width = 15)
+    @ApiModelProperty(value = "创建人id")
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+	/**修改人id*/
+	@Excel(name = "修改人id", width = 15)
+    @ApiModelProperty(value = "修改人id")
+	private String updateBy;
+	/**修改时间*/
+	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+	private Date updateTime;
+	/**删除标识，0:正常,1:删除*/
+	@Excel(name = "删除标识，0:正常,1:删除", width = 15)
+    @ApiModelProperty(value = "删除标识，0:正常,1:删除")
+	private Integer delFlag;
+}

+package com.skua.modules.report.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 重点事项推进情况--详情
+ */
+@Data
+@TableName("f_major_issues_process_item")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="f_major_issues_process_item对象", description="重点事项推进情况--详情")
+public class MajorIssuesProcessItem {
+
+	/**id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**事项编号id*/
+	@Excel(name = "事项编号id", width = 15)
+    @ApiModelProperty(value = "事项编号id")
+	private String matterProcessId;
+	/**事项进展*/
+	@Excel(name = "事项进展", width = 15)
+    @ApiModelProperty(value = "事项进展")
+	private String matterProgress;
+	/**创建人id*/
+	@Excel(name = "创建人id", width = 15)
+    @ApiModelProperty(value = "创建人id")
+	private String createBy;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+}

+package com.skua.modules.report.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.report.entity.MajorIssuesProcessItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 重点事项推进情况--详情
+ */
+public interface MajorIssuesProcessItemMapper extends BaseMapper<MajorIssuesProcessItem> {
+
+    /**
+     * 硒鼓重点事项的情况--当前事项
+     * @param majorIssuesProcessItem
+     */
+    void updateMajorIssuesProcess(MajorIssuesProcessItem majorIssuesProcessItem);
+}

+package com.skua.modules.report.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.report.entity.MajorIssuesProcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 重点事项推进情况
+ */
+public interface MajorIssuesProcessMapper extends BaseMapper<MajorIssuesProcess> {
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.report.mapper.MajorIssuesProcessItemMapper">
+
+    <update id="updateMajorIssuesProcess" >
+        update f_major_issues_process  set current_progress  = #{matterProgress} and current_progress_time = #{createTime}  where id = #{matterProcessId}
+    </update>
+
+</mapper>

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.report.mapper.MajorIssuesProcessMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.report.service;
+
+import com.skua.modules.report.entity.MajorIssuesProcessItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 重点事项推进情况--详情
+ */
+public interface IMajorIssuesProcessItemService extends IService<MajorIssuesProcessItem> {
+
+    void saveProcess(MajorIssuesProcessItem majorIssuesProcessItem);
+}

+package com.skua.modules.report.service;
+
+import com.skua.modules.report.entity.MajorIssuesProcess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 重点事项推进情况
+ */
+public interface IMajorIssuesProcessService extends IService<MajorIssuesProcess> {
+
+}

+package com.skua.modules.report.service.impl;
+
+import com.skua.modules.report.entity.MajorIssuesProcessItem;
+import com.skua.modules.report.mapper.MajorIssuesProcessItemMapper;
+import com.skua.modules.report.service.IMajorIssuesProcessItemService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 重点事项推进情况--详情
+ */
+@Service
+public class MajorIssuesProcessItemServiceImpl extends ServiceImpl<MajorIssuesProcessItemMapper, MajorIssuesProcessItem> implements IMajorIssuesProcessItemService {
+
+    @Transactional
+    public void saveProcess(MajorIssuesProcessItem majorIssuesProcessItem){
+        this.baseMapper.insert(majorIssuesProcessItem);
+        this.baseMapper.updateMajorIssuesProcess(majorIssuesProcessItem);
+    }
+}

+package com.skua.modules.report.service.impl;
+
+import com.skua.modules.report.entity.MajorIssuesProcess;
+import com.skua.modules.report.mapper.MajorIssuesProcessMapper;
+import com.skua.modules.report.service.IMajorIssuesProcessService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 重点事项推进情况
+ */
+@Service
+public class MajorIssuesProcessServiceImpl extends ServiceImpl<MajorIssuesProcessMapper, MajorIssuesProcess> implements IMajorIssuesProcessService {
+
+}

@@ -14,6 +14,7 @@ import java.io.Serializable;
 public class FRportlCommandCenterVO implements Serializable {
 public class FRportlCommandCenterVO implements Serializable {
     @ApiModelProperty(value = "标题")
     @ApiModelProperty(value = "标题")
     private String title;
     private String title;
+
     @ApiModelProperty(value = "结果")
     @ApiModelProperty(value = "结果")
     private String value;
     private String value;
 
 

+package com.skua.modules.equipment.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @auther kangwei
+ * @create 2025-02-19-18:25
+ */
+@Data
+@ApiModel(value="设备维修统计对象", description="设备维修统计对象")
+public class EquipmentRepairAnalysisVO {
+    @ApiModelProperty(value = "水厂编号")
+    private java.lang.String departId;
+
+    @ApiModelProperty(value = "水厂名称")
+    private java.lang.String departName;
+
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String equipmentName;
+    /**故障内容*/
+    @ApiModelProperty(value = "故障情况")
+    private java.lang.String faultContent;
+
+    @ApiModelProperty(value = "处理措施")
+    private java.lang.String faultLibraryId;
+
+}

@@ -94,7 +94,7 @@ public class MybatisInterceptor implements Interceptor {
         add("erp_purchase_plan_item");
         add("erp_purchase_plan_item");
         add("erp_purchase_material");
         add("erp_purchase_material");
         add("erp_distribut_material");
         add("erp_distribut_material");
-        add("erp_settlement");//供应商结算、水厂结算
+        //add("erp_settlement");//供应商结算、水厂结算
         //共享风险库
         //共享风险库
         add("danger_level_manage_share");
         add("danger_level_manage_share");
         // 库存表
         // 库存表