导出排班计划过滤调休息排班

解决设备信息导入子设备报错问题

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/OperationalConstants.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 
 public class OperationalConstants {
 
-	public final static String APP_NAME = "hzims-operational";
+	public final static String APP_NAME = "hzims-operational-thh";
 
 
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java

@@ -1427,6 +1427,9 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
 				ImsDutyMainReportExcel reportExcel = new ImsDutyMainReportExcel();
 
 				ImsDutyClassEntity imsDutyClass = deptDutyClassMap.get(imsDutyMainEntity.getClassId());
+				if (Func.isEmpty(imsDutyClass)) {
+					continue;
+				}
 				reportExcel.setDutyDate(dateStr);
 				reportExcel.setClassName(imsDutyClass.getClassName() + "(" + imsDutyClass.getStartTime() + " - " + imsDutyClass.getEndTime() + ")");