更改生成主键方法

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstrainLoadingResult;
 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;
@@ -12,8 +13,11 @@ import java.util.Map;
 public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoadingResult, BigDecimal> {
     //查询所有装车作业信息
     List<Map<String, Object>> getTmsWagonLoadInfo(Map<String,Object> map);
+
     //查询主键最大值
+    @Select("select seq_tmstrian_loading.nextval from dual")
     BigDecimal selectMaxId();
+
     //获取外轮船名
     String getResultForeignShipName(BigDecimal batchId);
     //获取物资ID

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstrainPleaseApproveResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.poi.ss.formula.functions.T;
 
 import java.math.BigDecimal;
@@ -30,6 +31,7 @@ public interface TmstrainPleaseApproveResultMapper extends IBaseMapper<TmstrainP
     List<Map<String, Object>> getApproveWagonPleaseById(Integer resultId);
 
     //获取最大ID主键值
+    @Select("select seq_tmstrian_please_approve.nextval from dual")
     BigDecimal selectMaxId();
 
     //获取收货单位

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstrainWagonUnloadResult;
 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;
@@ -13,6 +14,7 @@ public interface TmstrainWagonUnloadResultMapper extends IBaseMapper<TmstrainWag
     //查询所有卸车作业信息
     List<Map<String, Object>> getTmsWagonUnLoadInfo(Map<String,Object>map);
     //查询主键最大值
+    @Select("select seq_tmstrian_wagon_unload.nextval from dual")
     BigDecimal selectMaxId();
     //获得采购订单id
     BigDecimal getPurchaseOrderId(String resultWagonNo);

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

@@ -45,14 +45,9 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     @Override
     @Transactional
     public int addTmstrainLoadingResult(TmstrainLoadingResult tmstrainLoadingResult) {
-        long id;
-        if(tmstrainLoadingResultMapper.selectMaxId()==null){
-            id = 1;
-        }else {
-            id = tmstrainLoadingResultMapper.selectMaxId().longValue()+1;
-        }
+        BigDecimal maxId = tmstrainLoadingResultMapper.selectMaxId();
         //生成主键id
-        tmstrainLoadingResult.setResultId(new BigDecimal(id));
+        tmstrainLoadingResult.setResultId(maxId);
         //通过批次ID获得采购订单号和物资ID
         BigDecimal batchId = tmstrainLoadingResult.getBatchId();
         BigDecimal materialId = tmstrainLoadingResultMapper.getMaterialID(batchId);

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

@@ -58,14 +58,10 @@ public class TmstrainPleaseApproveResultServiceImpl implements ITmstrainPleaseAp
     @Override
     public int insertSelective(TmstrainPleaseApproveResult tmstrainPleaseApproveResult) {
         //生成主键ID
-        long id;
-        BigDecimal selectId = selectMaxId();
-        if(selectId == null){
-            id = 1;
-        }else {
-            id = selectId.longValue() + 1;
-        }
-        tmstrainPleaseApproveResult.setResultId(new BigDecimal(id));
+
+        BigDecimal maxId = selectMaxId();
+        long id = maxId.longValue();
+        tmstrainPleaseApproveResult.setResultId(maxId);
         //设置状态 新增的为未下发状态
         tmstrainPleaseApproveResult.setStatus(new BigDecimal(0));
         //生成请车计划号

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

@@ -44,14 +44,8 @@ public class TmstrainWagonUnloadResultServiceImpl implements ITmstrainWagonUnloa
 
     @Override
     public int addTmstrainWagonLoadResult(TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
-        long id;
-        if(tmstrainWagonUnloadResultMapper.selectMaxId()==null){
-            id = 1;
-        }else {
-            id = tmstrainWagonUnloadResultMapper.selectMaxId().longValue()+1;
-        }
         //生成主键id
-        tmstrainWagonUnloadResult.setUnloadingId(new BigDecimal(id));
+        tmstrainWagonUnloadResult.setUnloadingId(tmstrainWagonUnloadResultMapper.selectMaxId());
         //通过装车车皮号得到并插入采购订单id
         BigDecimal purchaseOrderId = tmstrainWagonUnloadResultMapper.getPurchaseOrderId(tmstrainWagonUnloadResult.getResultWagonNo());
         tmstrainWagonUnloadResult.setPurchaseOrderRailPlanId(purchaseOrderId);

src/main/resources/com/steerinfo/dil/mapper/TmstrainLoadingResultMapper.xml

@@ -739,9 +739,6 @@
     </if>
   </sql>
 
-  <select id="selectMaxId"  resultType="java.math.BigDecimal">
-    select max(RESULT_ID) from TMSTRAIN_LOADING_RESULT
-  </select>
 
   <select id="getResultForeignShipName" parameterType="java.math.BigDecimal" resultType="String">
     select RESULT_FOREIGN_SHIP_NAME

src/main/resources/com/steerinfo/dil/mapper/TmstrainPleaseApproveResultMapper.xml

@@ -659,10 +659,6 @@
     </if>
   </sql>
 
-  <!--  获取最大ID值  -->
-  <select id="selectMaxId"  resultType="java.math.BigDecimal">
-    select max(RESULT_ID) from TMSTRAIN_PLEASE_APPROVE_RESULT
-  </select>
 
 <!--  查询所有已批车作业 状态码为 2 -->
   <select id="getAllApproveWagonPlease" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">

src/main/resources/com/steerinfo/dil/mapper/TmstrainWagonUnloadResultMapper.xml

@@ -608,9 +608,6 @@
     </if>
   </sql>
 
-  <select id="selectMaxId"  resultType="java.math.BigDecimal">
-    select max(UNLOADING_ID) from TMSTRAIN_WAGON_UNLOAD_RESULT
-  </select>
 
   <select id="getPurchaseOrderId" parameterType="String" resultType="java.math.BigDecimal">
     select PURCHASE_ORDER_RAIL_PLAN_ID from TMSTRAIN_LOADING_RESULT where RESULT_WAGON_NO = #{resultWagonNo} and DELETED = 0