'合并冲突'

src/main/java/com/steerinfo/dil/service/impl/BmstrainSettlementServiceImpl.java

@@ -37,7 +37,7 @@ public class BmstrainSettlementServiceImpl implements IBmstrainSettlementService
      * @return
      */
     @Override
-    public List<Map<String,Object>> selectTrainSettlement(BigDecimal settlementId) {
+    public List<Map<String, Object>> selectTrainSettlement(BigDecimal settlementId) {
         return bmstrainSettlementMapper.selectTrainSettlement(settlementId);
     }
 

src/main/java/com/steerinfo/dil/util/NoUtil.java

@@ -35,12 +35,24 @@ public class NoUtil {
         }
         switch ((resultId.toString()).length()) {
             case 1:
-                resultNo = resultNo + "0000" + resultId;
+                resultNo = resultNo + "00000000" + resultId;
                 break;
             case 2:
-                resultNo = resultNo + "000" + resultId;
+                resultNo = resultNo + "0000000" + resultId;
                 break;
             case 3:
+                resultNo = resultNo + "000000" + resultId;
+                break;
+            case 5:
+                resultNo = resultNo + "00000" + resultId;
+                break;
+            case 6:
+                resultNo = resultNo + "0000" + resultId;
+                break;
+            case 7:
+                resultNo = resultNo + "000" + resultId;
+                break;
+            case 8:
                 resultNo = resultNo + "00" + resultId;
                 break;
             case 4: