提交

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

@@ -336,15 +336,14 @@ public class AMScontroller  extends BaseRESTfulController {
     @ApiOperation(value = "新增承运合同")
     @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
     @LogAround(foreignKeys = {"priceId"}, foreignKeyTypes = {"承运合同"})
-    @PostMapping("/")
+    @PostMapping("/addAmsTransPrice")
     public Map<String, Object> insertTransPrice(@RequestBody(required = false) Map<String, Object> map) throws ParseException {
         if (map.containsKey("priceDate")){
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date priceDate = simpleDateFormat.parse(map.get("priceDate").toString());
             map.put("priceDate", priceDate);
         }
-
-        return amsFeign.add(map);
+        return amsFeign.addAmsTransPrice(map);
     }
 
     @ApiOperation(value = "修改承运合同")

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

@@ -644,7 +644,7 @@ public class RMScontroller extends BaseRESTfulController {
             //校验行
             if(
                     item.get("姓名")==null || item.get("姓名").equals("")
-                            || item.get("身份证号")==null || item.get("身份证号").equals("")
+                            //|| item.get("身份证号")==null || item.get("身份证号").equals("")
                             || item.get("手机")==null || item.get("手机").equals("")
                             || item.get("单位")==null || item.get("单位").equals("")
                             || item.get("岗位名称")==null || item.get("岗位名称").equals("")

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -117,8 +117,8 @@ public interface AmsFeign {
                              @RequestParam Integer pageNum,
                              @RequestParam Integer pageSize);
 
-    @PostMapping("api/v1/ams/amstransprices/")
-    Map<String, Object> add(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping("api/v1/ams/amstransprices/addAmsTransPrice")
+    Map<String, Object> addAmsTransPrice(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/ams/amstransprices/{id}")
     Map<String, Object> update(@PathVariable BigDecimal id, @RequestBody(required = false) Map<String, Object> map);

src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -722,7 +722,7 @@ public interface RmsFeign {
                                          @RequestParam Integer pageNum,
                                          @RequestParam Integer pageSize);
 
-    @PostMapping("api/v1/rms/rmsextractscales/add")
+    @PostMapping("api/v1/rms/rmsextractscales/addRmsExtractScale")
     Map<String, Object> addExtractscale(@RequestBody(required = false) Map<String, Object> map);
 
     @PutMapping("api/v1/rms/rmsextractscales/logicdelete")

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

@@ -653,7 +653,7 @@
         select * from (
         select * from (
         select * from (
-        select rownum id,t.* from (
+        select rownum rowno,t.* from (
         SELECT DISTINCT
         RCA .CAPACITY_ID "capacityId",
         RCA .CAPACITY_ID "id",
@@ -764,7 +764,7 @@
         <if test="id!=null and id.size>0">
             UNION
             SELECT DISTINCT
-            0 id,
+            0 rowno,
             RCA .CAPACITY_ID "capacityId",
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",