修改序列号新增

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

@@ -39,6 +39,7 @@ public class BmsshipDetailsOrderController extends BaseRESTfulController {
 
     /**
      * 展示详单信息
+     *
      * @param mapValue
      * @param pageNum
      * @param pageSize
@@ -52,27 +53,27 @@ public class BmsshipDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "93", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getDetailsOrderList")
-    public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId)throws IOException {
+    public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId) throws IOException {
         //初始化过滤
-        List<Map<String, Object>> detailListTotal=null;
+        List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue==null){
+        if (mapValue == null) {
             //将查询结果存入索引中
             detailListTotal = bmsshipDetailsOrderSerivce.getDetailsOrderList(null);
             Map<String, Object> map = new HashMap<>();
             //添加索引
-            map.put("index","get_detail_order_list");
+            map.put("index", "get_detail_order_list");
             //添加id
-            map.put("indexId","detailsId");
+            map.put("indexId", "detailsId");
             detailListTotal.add(map);
             //新建索引
             String s = JSON.toJSONString(detailListTotal);
             esFeign.insertIndex(detailListTotal);
             //删除
-            detailListTotal.remove(detailListTotal.size()-1);
+            detailListTotal.remove(detailListTotal.size() - 1);
         }
         if (detailListTotal == null) {
             detailListTotal = bmsshipDetailsOrderSerivce.getDetailsOrderList(mapValue);
@@ -86,22 +87,23 @@ public class BmsshipDetailsOrderController extends BaseRESTfulController {
 
     @PostMapping("/getDetailsOrderList/{apiId}")
     public RESTfulResult getDetailListByCon(@PathVariable("apiId") Integer apiId,
-                                            @RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer pageNum,
                                             Integer pageSize,
-                                            String con){
-        if(mapValue==null){
-            mapValue=new HashMap<>();
+                                            String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
         }
         //设置要查询的索引名称
-        String index="get_detail_order_list";
+        String index = "get_detail_order_list";
         //获取查询结果
-        PageListAdd list = esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con);
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
         return success(list);
     }
 
     /**
      * 展示未生成账单的详单信息
+     *
      * @param mapValue
      * @param pageNum
      * @param pageSize
@@ -116,29 +118,29 @@ public class BmsshipDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "93", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getUncomplateDetailsOrderList")
-    public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId)throws IOException {
+    public RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId) throws IOException {
         //初始化过滤
-        List<Map<String, Object>> detailListTotal=null;
+        List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue==null){
+        if (mapValue == null) {
             //将查询结果存入索引中
             detailListTotal = bmsshipDetailsOrderSerivce.getUncomplateDetailsOrderList(null);
             Map<String, Object> map = new HashMap<>();
             //添加索引
-            map.put("index","get_uncomplate_detail_order_list");
+            map.put("index", "get_uncomplate_detail_order_list");
             //添加id
-            map.put("indexId","detailsId");
+            map.put("indexId", "detailsId");
             detailListTotal.add(map);
             //新建索引
             String s = JSON.toJSONString(detailListTotal);
             esFeign.insertIndex(detailListTotal);
             //删除
-            detailListTotal.remove(detailListTotal.size()-1);
+            detailListTotal.remove(detailListTotal.size() - 1);
         }
-        if (detailListTotal==null) {
+        if (detailListTotal == null) {
             detailListTotal = bmsshipDetailsOrderSerivce.getUncomplateDetailsOrderList(mapValue);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -150,22 +152,23 @@ public class BmsshipDetailsOrderController extends BaseRESTfulController {
 
     @PostMapping("/getUncomplateDetailsOrderList/{apiId}")
     public RESTfulResult getUncomplateDetailsOrderList(@PathVariable("apiId") Integer apiId,
-                                            @RequestBody(required=false) Map<String,Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            String con){
-        if(mapValue==null){
-            mapValue=new HashMap<>();
+                                                       @RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
         }
         //设置要查询的索引名称
-        String index="get_uncomplate_detail_order_list";
+        String index = "get_uncomplate_detail_order_list";
         //获取查询结果
-        PageListAdd list = esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con);
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
         return success(list);
     }
 
     /**
      * 新增详单
+     *
      * @param resultId
      * @return
      */

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

@@ -36,6 +36,7 @@ public class BmsshipDetailsStatementController extends BaseRESTfulController {
 
     /**
      * 展示详单信息
+     *
      * @param mapValue
      * @param pageNum
      * @param pageSize
@@ -49,10 +50,10 @@ public class BmsshipDetailsStatementController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "93", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getDetailsOrderList")
-    public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId) {
+    public RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId) {
         List<Map<String, Object>> list = bmsshipDetailsOrderSerivce.getDetailsOrderList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
@@ -63,6 +64,7 @@ public class BmsshipDetailsStatementController extends BaseRESTfulController {
 
     /**
      * 新增详单
+     *
      * @param resultId
      * @return
      */

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface BmsportHandlingFeeMapper extends IBaseMapper<BmsportHandlingFee, BigDecimal> {
@@ -47,4 +48,7 @@ public interface BmsportHandlingFeeMapper extends IBaseMapper<BmsportHandlingFee
      * @return
      */
     List<Map<String, Object>> selectPriceId();
+
+    @Select("select seq_BMS_HANDLING.nextval from dual")
+    BigDecimal selectHandlingId();
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.BmsshipDetailsOrder;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -57,4 +58,7 @@ public interface BmsshipDetailsOrderMapper  extends IBaseMapper<BmsshipDetailsOr
      * @return
      */
     int updateByPrimaryKeySelective(BmsshipDetailsOrder bmsshipDetailsOrder);
+
+    @Select("select seq_BMS_DETAILS.nextval from dual")
+    BigDecimal selectDetailsId();
 }

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

@@ -6,6 +6,7 @@ import java.math.*;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface BmsshipDetailsStatementMapper extends IBaseMapper<BmsshipDetailsStatement, BigDecimal> {
@@ -22,4 +23,7 @@ public interface BmsshipDetailsStatementMapper extends IBaseMapper<BmsshipDetail
      * @return
      */
     BigDecimal selectMaxId();
+
+    @Select("select seq_BMS_DETAIL_STATEMENT.nextval from dual")
+    BigDecimal selectDetailsStatementId();
 }

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface BmsshipStatementMapper extends IBaseMapper<BmsshipStatement, BigDecimal> {
@@ -79,4 +80,7 @@ public interface BmsshipStatementMapper extends IBaseMapper<BmsshipStatement, Bi
      * @return
      */
     List<Map<String,Object>> getBatch(Map<String,Object> mapVal);
+
+    @Select("select seq_BMS_STATEMENT.nextval from dual")
+    BigDecimal selectStatementId();
 }

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

@@ -102,8 +102,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
      */
     @Override
     public BigDecimal selectMaxId() {
-        BigDecimal feeId = bmsportHandlingFeeMapper.selectMaxId();
-        return feeId == null ? new BigDecimal(1) : new BigDecimal(feeId.intValue() + 1);
+        return bmsportHandlingFeeMapper.selectHandlingId();
     }
 
     /**

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

@@ -89,7 +89,7 @@ public class BmsshipDetailsOrderSerivceImpl implements IBmsshipDetailsOrderServi
      */
     @Override
     public BigDecimal selectMaxId() {
-        return bmsshipDetailsOrderMapper.selectMaxId() == null ? new BigDecimal(1) : bmsshipDetailsOrderMapper.selectMaxId();
+        return bmsshipDetailsOrderMapper.selectDetailsId();
     }
 
     /**

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

@@ -37,7 +37,6 @@ public class BmsshipDetailsStatementServiceImpl implements IBmsshipDetailsStatem
      */
     @Override
     public BigDecimal selectMaxId() {
-        BigDecimal id = bmsshipDetailsStatementMapper.selectMaxId();
-        return id == null ? new BigDecimal(1): new BigDecimal(id.intValue() + 1);
+        return bmsshipDetailsStatementMapper.selectDetailsStatementId();
     }
 }

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

@@ -154,8 +154,7 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
      */
     @Override
     public BigDecimal selectMaxId() {
-        BigDecimal id = bmsshipStatementMapper.selectMaxId();
-        return id == null ? new BigDecimal(1): new BigDecimal(id.intValue() + 1);
+        return bmsshipStatementMapper.selectStatementId();
     }
 
     /**