diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java index d7ae08f..a82c6dc 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/equipment/impl/WorkshopInfoServiceImpl.java @@ -18,4 +18,4 @@ import org.springframework.stereotype.Service; @DS("equipment") public class WorkshopInfoServiceImpl extends BaseServiceImpl implements WorkshopInfoService { -} +} \ No newline at end of file diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java index 30ab90c..6968b1d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/IOperDefectService.java @@ -1,13 +1,102 @@ package com.hnac.hzims.operational.defect.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.operational.defect.entity.OperDefectEntity; +import com.hnac.hzims.operational.defect.entity.OperPhenomenonEntity; +import com.hnac.hzims.operational.defect.vo.OperDefectVO; +import com.hnac.hzims.operational.report.vo.DefectReportsVO; +import com.hnac.hzims.vo.SafeCheckStatisticVO; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; +import org.springblade.flow.core.entity.BladeFlow; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.LocalDate; +import java.util.List; +import java.util.Map; /** - * @author ysj + * 服务类 + * + * @author Chill */ public interface IOperDefectService extends BaseService { + /** + * 开始问题处理流程 + * 问题处理流程的第一个处理节点人key 必须是 problemUser + * @param + */ + void startFlow(OperPhenomenonEntity entity, OperDefectEntity defectEntity); + /** + * 处理问题 + * @param flow + * @return + */ + boolean handleProcess(BladeFlow flow); + + /** + * 获取缺陷的统计月报 + * @param month 格式:"2021-01" + */ + Map getDefectStatistics(String month); + + /** + * 导出缺陷统计月报报表 + * @param response + * @param month 格式 "2021-01" + * @throws IOException + */ + void exportFualtMonthExcel(HttpServletResponse response, String month) throws IOException; + + + List getDefectList(String emCode,List list); + + List getDefectByEmCodeList(String emCode); + + /** + * 站点月报统计 - 消缺 + * @param startDate + * @param endDate + * @param deptIdList + * @return + */ + List getFaultByFaultCode(LocalDate startDate,LocalDate endDate,List deptIdList); + + List getFaultByFaultCode(Map params); + + List> getDefectConclusion(Map params); + + /** + * 缺陷详情 + * @param defect + * @return + */ + R detail(OperDefectEntity defect); + + /** + * 获取安全检查消缺项统计 + * @param startDate 开始时间 + * @param endDate 结束时间 + * @param dept 机构ID + * @param defectType 缺陷类型;1: 重大缺陷 2:一般缺陷 + * @return SafeCheckStatisticVO 对象 + */ + SafeCheckStatisticVO getDefectCheck(String startDate,String endDate,Long dept,String defectType); + + boolean updateDefectInfo(OperDefectEntity entity); + + boolean updateDefectHanderState(OperDefectEntity entity); + + + /** + * 分页查询 + * @param operDefectEntityPage + * @param defect + * @return + */ + IPage selectPage(Page operDefectEntityPage, OperDefectEntity defect); }