Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

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

@@ -13,6 +13,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -860,4 +861,20 @@ public class TMSController extends BaseRESTfulController {
     public RESTfulResult revokeOutBound(@RequestBody Map<String, Object> map) {
         return tmsFeign.revokeOutBound(map);
     }
+
+
+    @ApiOperation(value = "查询车辆登记单信息")
+    @PostMapping("/likeTransitOrders")
+    public Map<String, Object> likeTransitOrders(@RequestBody(required = false) Map<String, Object> map,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize) {
+        return tmsFeign.likeTransitOrders(map == null ? new HashMap<>() : map, apiId, pageNum, pageSize);
+    }
+
+    @ApiOperation(value = "新增车辆登记单信息")
+    @PostMapping("/insertTmsTransitOrder")
+    public Map<String,Object> insertTmsTransitOrder(@RequestBody Map<String,Object> map) {
+        return tmsFeign.insertTmsTransitOrder(map);
+    }
 }

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

@@ -296,6 +296,15 @@ public interface TmsFeign {
 
     @PostMapping(value = "api/v1/tms/omstransorders/revokeOutBound")
     RESTfulResult revokeOutBound(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/tms/tmstransitorders/likeTransitOrders")
+    Map<String, Object> likeTransitOrders(@RequestBody Map<String, Object> objectMap,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize);
+
+    @PostMapping(value = "api/v1/tms/tmstransitorders/insertTmsTransitOrder")
+    Map<String, Object> insertTmsTransitOrder(Map<String, Object> map);
 }
 
 

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

@@ -310,7 +310,8 @@
         OPERATION_POINT_ID "value",
         OPERATION_POINT_NAME "OPERATION_POINT_NAME",
         OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
-        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
+        OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text",
+        OPERATION_POINT_CODE "code"
         from RMS_OPERATION_POINT
         <where>
             DELETED = 0
@@ -339,7 +340,8 @@
             OPERATION_POINT_ID "value",
             OPERATION_POINT_NAME "OPERATION_POINT_NAME",
             OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "label",
-            OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text"
+            OPERATION_POINT_CODE || '-' || OPERATION_POINT_NAME "text",
+            OPERATION_POINT_CODE "code"
             from RMS_OPERATION_POINT
             where  OPERATION_POINT_ID in
             <foreach collection="id" item="item"  open="(" close=")" separator="," >
@@ -671,18 +673,6 @@
             ) T ON T."capacityId" = RCA .CAPACITY_ID
         </if>
         WHERE RCA .DELETED = 0
-        <if test="capacityTypeId !=null">
-            AND (RCT.CAPACITY_TYPE_ID in (
-                select rct.capacity_type_id from rms_capacity_type rct
-                START WITH rct.capacity_type_id = #{capacityTypeId}
-                connect BY PRIOR rct.capacity_type_id = rct.p_capacity_type_id
-                )
-                or RCA.CAPACITY_TYPE_ID2 in (
-                select rct.capacity_type_id from rms_capacity_type rct
-                START WITH rct.capacity_type_id = #{capacityTypeId}
-                connect BY PRIOR rct.capacity_type_id = rct.p_capacity_type_id
-            ))
-        </if>
         <if test="capacityType != null and capacityType != '' ">
             AND RCT.CAPACITY_TYPE_NAME = #{capacityType}
         </if>
@@ -850,10 +840,6 @@
         on RC.trans_range_id = t1.trans_range_id
         <where>
             and RC.DELETED = 0
-            <if test="isNc!=null and isNc!=''">
-                and rop_s.alternate_fields1 = 'NC'
-                and rop_e.alternate_fields1 = 'NC'
-            </if>
         </where>
         )
         <where>