班级修改调整

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskClassServiceImpl.java

@@ -251,7 +251,8 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
                         .eq(BaseClass::getGradeId, task.getGradeId())
                         .eq(BaseClass::getEnrollType, task.getEnrollType())
         );
-        Collections.sort(classList, Comparator.nullsLast(Comparator.comparing(BaseClass::getCode)));
+        List<BaseClass> classCodes = classList.stream().filter(x -> x.getCode() != null).collect(Collectors.toList());
+        Collections.sort(classCodes, Comparator.comparing(BaseClass::getCode));
         String classCode = classList.get(0).getCode();
 
         Map<Long, BaseClass> classMap = classList.stream().collect(Collectors.toMap(BaseClass::getId, x -> x));
@@ -296,6 +297,10 @@ public class BandingTaskClassServiceImpl extends MPJBaseServiceImpl<BandingTaskC
                     baseClass.setIsOrderClass(sourceObj.getIsOrderClass());
                     baseClass.setOrgId(majorDeptMap.get(sourceObj.getMajorSetId()));
                     baseClass.setEnrollType(task.getEnrollType());
+                    if(baseClass.getCode() == null){
+                        i ++;
+                        baseClass.setCode(baseGrade.getTitle().replace("年", "") + String.format("%03d", i));
+                    }
                     classMapper.updateById(baseClass);
                 }else{
                     i ++;

src/main/resources/application-prod.yml

@@ -6,8 +6,8 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://219.153.208.35:3306/smart_campus?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
-    username: root
-    password: xzNDL3dcx#TyEz^a
+    username: smart_campus
+    password: W2Xk@8QFe3hYR7QZ?-yY
 
 
   redis: