服务计划需求

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ServicePlanServiceImpl.java

@@ -406,7 +406,7 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
                                             Object obj = DataInfo.get(val);
                                             if (obj instanceof String[]) {
                                                 String[] dataDate = (String[]) obj;
-                                                myData = dataDate[0].trim() + "-" + dataDate[1].trim();
+                                                myData = dataDate[0].trim() + "至" + dataDate[1].trim();
                                                 if (dataDate[0].trim().equals(dataDate[1].trim())) {
                                                     myData = dataDate[0];
                                                 }
@@ -455,6 +455,15 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
                                             if (row != null) {
                                                 Cell cell = row.getCell(x1 - 1);
                                                 if (cell != null) {
+                                                    if(myData.contains("[")&&myData.contains("]")){
+                                                        myData=myData.replace("[", "").replace("]", "");
+                                                        if (myData.contains(",")){
+                                                            myData=  myData.replace(", ","至");
+                                                        }
+                                                        if (myData.contains("，")){
+                                                            myData=  myData.replace(", ","至");
+                                                        }
+                                                    }
                                                     cell.setCellValue(myData);
                                                 } else {
                                                     ObjectUtils.isNotEmpty(cell);
@@ -549,7 +558,10 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
                             String[] mysql = tabVal.split("☆");
                             for (String data : mysql) {
                                 String[] tabData = data.split("_\\^_");
-                                if (StringUtils.isNotEmpty(tabData[0])) {
+                                if (tabVal.contains("[")) {
+                                    String[] strings = StringUtils.strip(tabData[0], "[]").split(",");
+                                    reData.put(key + "__" + tabData[1], strings);
+                                } else {
                                     reData.put(key + "__" + tabData[1], tabData[0]);
                                 }
                             }
@@ -635,7 +647,7 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
             plan.setId(groupId1);
             ServicePlan plan1 = this.getById(plan.getId());
             if(plan1.getWriteUser()!=null){
-                if(!plan1.getWriteUser().contains(SecureUtil.getUserId()+"")){
+                if(plan1.getStatus()!=2&&!plan1.getWriteUser().contains(SecureUtil.getUserId()+"")){
                     plan.setWriteUser(plan1.getWriteUser()+","+SecureUtil.getUserId());
                 }
             }