日常维护新增站点

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenancePlanEntity.java

@@ -108,4 +108,10 @@ public class OperMaintenancePlanEntity extends TenantEntity {
 	@JsonSerialize(nullsUsing = NullSerializer.class)
 	private Long messageTemplateId;
 
+
+	/**
+	 * 站点code
+	 */
+	private  String stationCode;
+
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/dto/OperMaintenanceMonitorReportMonthDTO.java

@@ -24,4 +24,9 @@ public class OperMaintenanceMonitorReportMonthDTO implements Serializable {
 	@ApiModelProperty(value = "月", required = true)
 	private Integer month;
 
+
+	/**
+	 * 站点code
+	 */
+	private  String stationCode;
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceMonitorServiceImpl.java

@@ -12,6 +12,7 @@ import com.hnac.hzims.operational.maintenance.mapper.OperMaintenanceTaskMapper;
 import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceMonitorService;
 import com.hnac.hzims.operational.maintenance.vo.OperMaintenancePlanVO;
 import com.hnac.hzims.operational.maintenance.wrapper.OperMaintenancePlanWrapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
 import org.springblade.system.user.cache.UserCache;
@@ -44,23 +45,24 @@ public class OperMaintenanceMonitorServiceImpl implements IOperMaintenanceMonito
     @Override
     public R<Map<String, List<OperMaintenancePlanVO>>> reportMonth(OperMaintenanceMonitorReportMonthDTO req) {
         List<OperMaintenancePlanEntity> planEntities = planMapper.selectList(new LambdaQueryWrapper<OperMaintenancePlanEntity>() {{
-			LocalDate startDate = LocalDate.of(req.getYear(), req.getMonth(),1);
+            LocalDate startDate = LocalDate.of(req.getYear(), req.getMonth(), 1);
             // Date startTime = DateUtil.parse(DateUtil.format(DateUtil.now(), "yyyy-MM") + "-01", DateUtil.PATTERN_DATE);
             eq(OperMaintenancePlanEntity::getIsDeleted, 0L);
             ge(OperMaintenancePlanEntity::getDisposeTime, startDate);
-			lt(OperMaintenancePlanEntity::getDisposeTime, startDate.with(TemporalAdjusters.lastDayOfMonth()));
+            lt(OperMaintenancePlanEntity::getDisposeTime, startDate.with(TemporalAdjusters.lastDayOfMonth()))
+                    .eq(StringUtils.isNoneBlank(req.getStationCode()), OperMaintenancePlanEntity::getStationCode, req.getStationCode());
         }});
 
         //获取列表班次ID集合
         List<Long> classIdList = planEntities.stream().filter(planEntity -> ObjectUtil.isNotEmpty(planEntity.getImsDutyClassId()))
                 .map(OperMaintenancePlanEntity::getImsDutyClassId).collect(Collectors.toList());
         IImsDutyClassService imsDutyClassService = SpringUtil.getBean(IImsDutyClassService.class);
-		Map<Long,List<ImsDutyClassEntity>> classMap = null;
+        Map<Long, List<ImsDutyClassEntity>> classMap = null;
-		if(CollectionUtil.isNotEmpty(classIdList)) {
+        if (CollectionUtil.isNotEmpty(classIdList)) {
-			List<ImsDutyClassEntity> classEntityList = imsDutyClassService.list(new LambdaQueryWrapper<ImsDutyClassEntity>(){{
+            List<ImsDutyClassEntity> classEntityList = imsDutyClassService.list(new LambdaQueryWrapper<ImsDutyClassEntity>() {{
-				in(ImsDutyClassEntity::getId,classIdList);
+                in(ImsDutyClassEntity::getId, classIdList);
             }});
-			if(CollectionUtil.isNotEmpty(classEntityList)) {
+            if (CollectionUtil.isNotEmpty(classEntityList)) {
                 classMap = classEntityList.stream().collect(Collectors.groupingBy(ImsDutyClassEntity::getId));
             }
         }
@@ -69,18 +71,17 @@ public class OperMaintenanceMonitorServiceImpl implements IOperMaintenanceMonito
         List<OperMaintenancePlanVO> operMaintenancePlanVOS = new ArrayList<>();
         Map<Long, List<ImsDutyClassEntity>> finalClassMap = classMap;
         planEntities.forEach(planEntity -> {
-			OperMaintenancePlanVO planVO = BeanUtil.copy(planEntity,OperMaintenancePlanVO.class);
+            OperMaintenancePlanVO planVO = BeanUtil.copy(planEntity, OperMaintenancePlanVO.class);
-			if(ObjectUtil.isNotEmpty(planEntity.getImsDutyClassId())) {
+            if (ObjectUtil.isNotEmpty(planEntity.getImsDutyClassId())) {
                 //类型为班次时 获取班次名称
                 planVO.setDutyClassName(finalClassMap.get(planEntity.getImsDutyClassId()).get(0).getClassName());
-			}
+            } else if (ObjectUtil.isNotEmpty(planEntity.getDisposer())) {
-			else if(ObjectUtil.isNotEmpty(planEntity.getDisposer())) {
                 //类型为人员类型时 获取执行人名称
                 planVO.setDisposerName(Optional.ofNullable(UserCache.getUser(planEntity.getDisposer())).map(User::getName).orElse(null));
             }
             //当月是否生成任务 默认是false
             LocalDateTime createTaskTime = com.hnac.hzims.common.utils.DateUtil.DateToLocalDateTime(planEntity.getCreateTaskTime());
-			if(ObjectUtil.isNotEmpty(createTaskTime) && com.hnac.hzims.common.utils.DateUtil.judgeSameDay(createTaskTime, LocalDate.now())) {
+            if (ObjectUtil.isNotEmpty(createTaskTime) && com.hnac.hzims.common.utils.DateUtil.judgeSameDay(createTaskTime, LocalDate.now())) {
                 planVO.setGenerateSign(true);
             }
             operMaintenancePlanVOS.add(planVO);

hzims-service/operational/src/main/resources/db/1.0.1.sql

@@ -0,0 +1 @@
+alter  table  hzims_oper_maintenance_plan add  station_code varchar(60) comment  '站点编码'