运力修改备注

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

@@ -1106,4 +1106,10 @@ public class RMScontroller {
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
         return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
     }
+
+    @ApiOperation("渲染运力修改数据")
+    @PostMapping("/getCapacityInfoById/{id}")
+    public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
+        return rmsFeign.getCapacityInfoById(id);
+    }
 }

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

@@ -152,7 +152,8 @@ public class UniversalController extends BaseRESTfulController {
                                         Integer pageSize,
                                         String carrierSsoId,
                                         String index,
-                                        String con
+                                        String con,
+                                        String indexText
     ){
         if(mapValue == null){
             mapValue = new HashMap<>();
@@ -163,6 +164,10 @@ public class UniversalController extends BaseRESTfulController {
         if (con != null&& !con.equals("undefined")){
             mapValue.put("con",con);
         }
+        if (indexText != null&& !indexText.equals("undefined")){
+            mapValue.put("indexText",indexText);
+        }
+
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;
         }

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

@@ -605,4 +605,7 @@ public interface RmsFeign {
     @ApiOperation("解除承运商和车辆的绑定关系")
     @PostMapping("api/v1/rms/rmscapacity/deleteCapacityCarrier")
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
+    Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
 }

src/main/resources/application-prod.yml

@@ -33,7 +33,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.33.166:8060}
+    url: ${RMSFEIGN_URL:localhost:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   OTMSFeign:

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

@@ -149,18 +149,18 @@
     <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
         SELECT *
         FROM (
-                 SELECT
-                        RC.CAPACITY_ID        "capacityId",
-                        RCC.CARRIER_ID         "carrierId",
-                        RC.CAPACITY_NUMBER     "capacityNumber",
-                        RCA.CARRIER_NAME       "carrierName",
-                        RC.INSERT_UPDATE_REMARK "remark"
-                 FROM RMS_CAPACITY_CARRIER RCC
-                            LEFT JOIN RMS_CAPACITY RC
-                     ON RCC.CAPACITY_ID = RC.CAPACITY_ID
-                          JOIN RMS_CARRIER RCA
-                                ON RCA.CARRIER_ID = RCC.CARRIER_ID
-                 WHERE RC.CAPACITY_SSO_ID is not NULL
+        SELECT
+        RC.CAPACITY_ID "capacityId",
+        RCC.CARRIER_ID "carrierId",
+        RCC.CAPACITY_CARRIER_ID,
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RCA.CARRIER_NAME "carrierName",
+        RCC.INSERT_UPDATE_REMARK "remark"
+        FROM
+        RMS_CAPACITY_CARRIER RCC
+        LEFT JOIN RMS_CAPACITY RC ON RCC.CAPACITY_ID = RC.CAPACITY_ID
+        JOIN RMS_CARRIER RCA ON RCA.CARRIER_ID = RCC.CARRIER_ID
+        WHERE RC.CAPACITY_SSO_ID is not NULL
             <if test="carrierId != null" >
                 and RCC.CARRIER_ID = #{carrierId}
             </if>
@@ -168,7 +168,10 @@
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0 or  instr(RC.INSERT_UPDATE_REMARK, #{index})>0)
             </if>
             <if test="con != null">
-                and instr(RC.INSERT_UPDATE_REMARK, #{con}) > 0
+                and instr(RCA.INSERT_UPDATE_REMARK, #{con}) > 0
+            </if>
+            <if test="indexText!=null">
+                and instr(RCC.CAPACITY_USER_DEP, #{indexText}) > 0
             </if>
         )
         <where>