diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java index ab5089b..75ba489 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java @@ -37,8 +37,6 @@ public interface IOperAccessTaskService extends BaseService> list(OperAccessTaskDTO req, Query query); R> listByStatus(OperAccessTaskDTO req, Query query); - List getByEmCode(String emCode,List list); - /** * 获取站点统计月报-检修 * @param startDate 开始时间 @@ -48,10 +46,9 @@ public interface IOperAccessTaskService extends BaseService getAccessTaskByDisposer(LocalDate startDate, LocalDate endDate, List deptIdList); - List getAccessTaskByDisposer(Map params); + List getAccessTaskByName(Map params); - List> getAccessConclusion(Map params); List getAccessTask(String startTime,String endTime,List list); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java index 8174169..3242e57 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/impl/OperAccessTaskServiceImpl.java @@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.feign.IEmInfoClient; -import com.hnac.hzims.message.enums.PushStatEnum; import com.hnac.hzims.message.fegin.IMessagePushClient; import com.hnac.hzims.message.req.PushExtrasReq; import com.hnac.hzims.operational.OperationalConstants; @@ -61,7 +60,6 @@ import org.springblade.flow.core.feign.IFlowClient; import org.springblade.flow.core.utils.FlowUtil; import org.springblade.flow.core.utils.TaskUtil; import org.springblade.flow.core.vo.ComleteTask; -import org.springblade.system.cache.DictCache; import org.springblade.system.entity.Dept; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.cache.UserCache; @@ -254,11 +252,6 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl getByEmCode(String emCode, List list) { - return this.baseMapper.selectByEmCode(emCode, list); - } - - @Override public List getAccessTaskByDisposer(LocalDate startDate, LocalDate endDate, List deptIdList) { List inspectOrAccessReportVOList = new ArrayList<>(); //获取月份内的检修任务 @@ -299,14 +292,6 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl getAccessTaskByDisposer(Map params) { - LocalDate startDate = LocalDate.parse(params.get("startDate").toString(), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATE)); - LocalDate endDate = LocalDate.parse(params.get("endDate").toString(), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATE)); - List deptIdList = (List) params.get("deptId"); - return getAccessTaskByDisposer(startDate, endDate, deptIdList); - } - - @Override public List getAccessTaskByName(Map params) { LocalDate startDate = LocalDate.parse(params.get("startDate").toString(), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATE)); LocalDate endDate = LocalDate.parse(params.get("endDate").toString(), DateTimeFormatter.ofPattern(DateUtil.PATTERN_DATE));