#代码合并

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/service/IOperAccessTaskService.java

@@ -37,8 +37,6 @@ public interface IOperAccessTaskService extends BaseService<OperAccessTaskEntity
 	R<IPage<OperAccessTaskVO>> list(OperAccessTaskDTO req, Query query);
 	R<IPage<OperAccessTaskVO>> listByStatus(OperAccessTaskDTO req, Query query);
 
-	List<OperAccessTaskEntity> getByEmCode(String emCode,List<String> list);
-
 	/**
 	 * 获取站点统计月报-检修
 	 * @param startDate 开始时间
@@ -48,10 +46,9 @@ public interface IOperAccessTaskService extends BaseService<OperAccessTaskEntity
 	 */
 	List<AccessReportVO> getAccessTaskByDisposer(LocalDate startDate, LocalDate endDate, List<Long> deptIdList);
 
-	List<AccessReportVO> getAccessTaskByDisposer(Map<String,Object> params);
+
 	List<AccessRunReportVO> getAccessTaskByName(Map<String,Object> params);
 
-	List<Map<String,Object>> getAccessConclusion(Map<String,Object> params);
 
 	List<OperAccessTaskEntity> getAccessTask(String startTime,String endTime,List<Long> list);
 

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<OperAccessTaskMap
     }
 
     @Override
-    public List<OperAccessTaskEntity> getByEmCode(String emCode, List<String> list) {
-        return this.baseMapper.selectByEmCode(emCode, list);
-    }
-
-    @Override
     public List<AccessReportVO> getAccessTaskByDisposer(LocalDate startDate, LocalDate endDate, List<Long> deptIdList) {
         List<AccessReportVO> inspectOrAccessReportVOList = new ArrayList<>();
         //获取月份内的检修任务
@@ -299,14 +292,6 @@ public class OperAccessTaskServiceImpl extends BaseServiceImpl<OperAccessTaskMap
     }
 
     @Override
-    public List<AccessReportVO> getAccessTaskByDisposer(Map<String, Object> 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<Long> deptIdList = (List<Long>) params.get("deptId");
-        return getAccessTaskByDisposer(startDate, endDate, deptIdList);
-    }
-
-    @Override
     public List<AccessRunReportVO> getAccessTaskByName(Map<String, Object> 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));