20201127v1.2修改出场顺序表导出

mt/src/main/java/com/ccsens/mt/service/ExcelService.java

@@ -640,20 +640,30 @@ public class ExcelService implements IExcelService {
                         List<PoiUtil.PoiUtilCell> three = new ArrayList<>();
                         PoiUtil.PoiUtilCell three1;
                         PoiUtil.PoiUtilCell three2;
+                        PoiUtil.PoiUtilCell three3 = null;
                         if (q == 0) {
                             three1 = new PoiUtil.PoiUtilCell(project.getStartTime(), 1, j);
                             three2 = new PoiUtil.PoiUtilCell(project.getProjectName(), 1, j);
+                            if(project.getJoinRule() == 1) {
+                                three3 = new PoiUtil.PoiUtilCell("不限组别", 1, j);
+                            }
                             q++;
                         } else {
                             three1 = new PoiUtil.PoiUtilCell();
                             three2 = new PoiUtil.PoiUtilCell();
+                            if(project.getJoinRule() == 1) {
+                                three3 = new PoiUtil.PoiUtilCell();
+                            }
                         }
-                        PoiUtil.PoiUtilCell three3;
-                        if (t == 0) {
-                            three3 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getGroupName(), 1, project.getProjectList().get(k).getCompanyNameList().size());
-                            ++t;
-                        } else {
-                            three3 = new PoiUtil.PoiUtilCell();
+//                        PoiUtil.PoiUtilCell three3 = null;
+                        if(project.getJoinRule() == 0) {
+                            if (t == 0) {
+                                    three3 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getGroupName(), 1, project.getProjectList().get(k).getCompanyNameList().size());
+                                    ++t;
+
+                            } else {
+                                three3 = new PoiUtil.PoiUtilCell();
+                            }
                         }
                         PoiUtil.PoiUtilCell three4 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getStartOrder(), 1, 1);
                         PoiUtil.PoiUtilCell three5 = new PoiUtil.PoiUtilCell(project.getProjectList().get(k).getCompanyNameList().get(m).getCompanyName(), 1, 1);

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: prod
-    include: util-prod,common
+    active: dev
+    include: util-dev,common