feature 甘特图增加显示排程异常原因

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/GanttServiceImpl.java

@@ -65,7 +65,7 @@ public class GanttServiceImpl implements GanttService {
     public static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     public static final String DEFAULT_TYPE = "project";
     public static final String DEFAULT_RENDER = "split";
-    public static final String SCHEDULING_STR = "%s-正在排程";
+    public static final String SCHEDULING_STR = "%s-正在排程 %s";
     public static final String SCHEDULING_TO_BE_PUBLISHED_STR = "%s-排程结束待发布";
     public static final String DEFAULT_SPLIT = "-;-";
     public static final Map<String,String> GANTT_PROCESS_STATUS_MAP=new HashMap<String,String>(){{
@@ -151,7 +151,11 @@ public class GanttServiceImpl implements GanttService {
         if (rLock.isLocked()) {
             try {
                 SysUserVo sysUserVo = (SysUserVo) redisService.getRedisCatchObj("apsUser-" + factoryId);
-                return R.ok(String.format(SCHEDULING_STR, sysUserVo.getName()));
+                String returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(),"");
+                if(StringUtils.isNotBlank(sysUserVo.getRoption())){
+                    returnMsg = String.format(SCHEDULING_STR, sysUserVo.getName(),"排程异常："+sysUserVo.getRoption());
+                }
+                return R.ok(returnMsg);
             } catch (Exception e) {
                 log.error("获取当前排程用户失败,原因：{}", e.toString());
                 return R.error("获取排程用户失败,请联系管理员");
@@ -317,8 +321,8 @@ public class GanttServiceImpl implements GanttService {
              * 作业生产状态不是待发布 ——>作业明细的作业状态
              * 作业生产状态是待发-> 待发布
              */
-            if(SaveConstans.ProductionStatus.TO_BE_PUBLISHED.equals(data.getProcessstatus())){
-                data.setGanttprocessstatus(SaveConstans.ProductionStatus.TO_BE_PUBLISHED);
+            if(TO_BE_PUBLISHED.equals(data.getProcessstatus())){
+                data.setGanttprocessstatus(TO_BE_PUBLISHED);
             } else{
                 data.setGanttprocessstatus(GANTT_PROCESS_STATUS_MAP.getOrDefault(data.getWorkstatus(),""));
             }