'销售火运与采购火运合并修改bug'

src/main/java/com/steerinfo/dil/controller/BmstrainSettlementController.java

@@ -115,7 +115,7 @@ public class BmstrainSettlementController extends BaseRESTfulController {
     })
     @PostMapping("/selectTrainSettlement/{settlementId}")
     public RESTfulResult selectTrainSettlement(@PathVariable("settlementId") BigDecimal settlementId) {
-        BmstrainSettlement bmstrainSettlement = bmstrainSettlementService.selectTrainSettlement(settlementId);
+        List<Map<String,Object>> bmstrainSettlement = bmstrainSettlementService.selectTrainSettlement(settlementId);
         return success(bmstrainSettlement);
     }
 

src/main/java/com/steerinfo/dil/mapper/BmstrainSettlementMapper.java

@@ -27,5 +27,5 @@ public interface BmstrainSettlementMapper extends IBaseMapper<BmstrainSettlement
      * @param settlementId
      * @return
      */
-    BmstrainSettlement selectTrainSettlement(BigDecimal settlementId);
+    List<Map<String,Object>> selectTrainSettlement(BigDecimal settlementId);
 }

src/main/java/com/steerinfo/dil/service/IBmstrainSettlementService.java

@@ -25,7 +25,7 @@ public interface IBmstrainSettlementService {
      * @param settlementId
      * @return
      */
-    BmstrainSettlement selectTrainSettlement(BigDecimal settlementId);
+    List<Map<String,Object>> selectTrainSettlement(BigDecimal settlementId);
 
     /**
      * 修改火运结算

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

@@ -37,7 +37,7 @@ public class BmstrainSettlementServiceImpl implements IBmstrainSettlementService
      * @return
      */
     @Override
-    public BmstrainSettlement selectTrainSettlement(BigDecimal settlementId) {
+    public List<Map<String, Object>> selectTrainSettlement(BigDecimal settlementId) {
         return bmstrainSettlementMapper.selectTrainSettlement(settlementId);
     }
 
@@ -78,6 +78,7 @@ public class BmstrainSettlementServiceImpl implements IBmstrainSettlementService
         bmstrainSettlement.setInsertUsername("admin");
         bmstrainSettlement.setUpdateUsername("admin");
         bmstrainSettlement.setInsertUpdateRemark("无");
+        bmstrainSettlement.setDeleted(new BigDecimal(0));
         return bmstrainSettlementMapper.insertSelective(bmstrainSettlement);
     }
 

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:

src/main/resources/bootstrap.yml

@@ -14,7 +14,7 @@ spring:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:localhost:8038}
 
 #eureka设置
 eureka: