소스 검색

2021/07/22 -LRL

lirl 3 년 전
부모
커밋
1ab143b392

+ 1 - 1
src/main/java/com/steerinfo/ems/trmstation/mapper/TRmStationMapper.xml

@@ -217,6 +217,6 @@
     select ID, NAME from T_RM_STATION order by NAME
   </select>
   <select id="getMaxSortSeq" resultType="java.lang.Long">
-    SELECT MAX(SORTSEQ) from T_RM_STATION
+    SELECT nvl(max(SORTSEQ+1),0) from T_RM_STATION
   </select>
 </mapper>

+ 1 - 0
src/main/java/com/steerinfo/ems/trmstation/service/ITRmStationService.java

@@ -1,6 +1,7 @@
 package com.steerinfo.ems.trmstation.service;
 
 import com.steerinfo.ems.trmstation.model.TRmStation;
+import com.steerinfo.framework.datasource.TargetDataSource;
 import com.steerinfo.framework.service.IBaseService;
 
 import java.util.List;

+ 1 - 0
src/main/java/com/steerinfo/ems/trmunit/controller/TRmUnitController.java

@@ -196,6 +196,7 @@ public class TRmUnitController extends BaseRESTfulController {
         return success();
     }
 
+
     @ApiOperation(value = "获取Id 和 Name",notes = "获取下拉框得值(可传参数isstd(是否标准单位))")
     @GetMapping(value = "/getIdAndName")
     public RESTfulResult getIdAndName(@RequestParam HashMap params){

+ 3 - 0
src/main/java/com/steerinfo/ems/trmunit/mapper/TRmUnitMapper.java

@@ -1,6 +1,8 @@
 package com.steerinfo.ems.trmunit.mapper;
 
 import com.steerinfo.ems.trmunit.model.TRmUnit;
+import com.steerinfo.framework.datasource.DataSourceKey;
+import com.steerinfo.framework.datasource.TargetDataSource;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -12,5 +14,6 @@ import java.util.Set;
 public interface TRmUnitMapper extends IBaseMapper<TRmUnit, String> {
 
     List<TRmUnit> getIdAndName(Map<String, Object> parameters);
+
     String getMaxId();
 }

+ 3 - 4
src/main/java/com/steerinfo/ems/trmunit/service/impl/TRmUnitServiceImpl.java

@@ -4,6 +4,8 @@ import com.steerinfo.ems.trmunit.controller.TRmUnitController;
 import com.steerinfo.ems.trmunit.mapper.TRmUnitMapper;
 import com.steerinfo.ems.trmunit.model.TRmUnit;
 import com.steerinfo.ems.trmunit.service.ITRmUnitService;
+import com.steerinfo.framework.datasource.DataSourceKey;
+import com.steerinfo.framework.datasource.TargetDataSource;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.slf4j.Logger;
@@ -41,6 +43,7 @@ public class TRmUnitServiceImpl extends BaseServiceImpl<TRmUnit, String> impleme
         return tRmUnitMapper;
     }
 
+
     public List<TRmUnit> getIdAndName(Map<String, Object> parameters) {
         return tRmUnitMapper.getIdAndName(parameters);
     }
@@ -66,8 +69,4 @@ public class TRmUnitServiceImpl extends BaseServiceImpl<TRmUnit, String> impleme
         }
         return changeexp/exp;
     }
-
-    public static void main(String[] args) {
-        //System.out.println(TRmUnitServiceImpl.getchangerate());
-    }
 }