提交代码

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

@@ -61,6 +61,18 @@ public class RMScontroller {
     }
 
     @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/deleteMaterialForInward")
+    public Map<String, Object> deleteMaterialForInward(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.deleteMaterialForInward(mapValue);
+    }
+
+    @ApiOperation(value="查询线路中的门岗汽车衡", notes="分页查询")
+    @PostMapping("/updateMaterialForInward")
+    public Map<String, Object> updateMaterialForInward(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.updateMaterialForInward(mapValue);
+    }
+
+    @ApiOperation(value="删除数据为了内转")
     @PostMapping("/getGateCalculateMes")
     public Map<String, Object> getGateCalculateMes(@RequestParam Integer lineId){
         return rmsFeign.getGateCalculateMes(lineId);

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

@@ -711,12 +711,16 @@ public class UniversalController extends BaseRESTfulController {
     @PostMapping("/getOilFormula")
     public RESTfulResult getOilFormula(@RequestBody(required = false) Map<String,Object> mapValue,
                                        Integer apiId,
+                                       String con,
                                        Integer pageNum,
-                                       Integer pageSize) {
+                                       Integer pageSize
+                                       ) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        mapValue.put("con", "%执行运价公式");
+        if (con!=null){
+            mapValue.put("con", "%"+con+"%");
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.getOilFormula(mapValue);

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

@@ -370,6 +370,12 @@ public interface RmsFeign {
                                             @RequestParam Integer apiId,
                                             @RequestParam String con);
 
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/deleteMaterialForInward")
+    Map<String, Object> deleteMaterialForInward(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/updateMaterialForInward")
+    Map<String, Object> updateMaterialForInward(@RequestBody(required = false) Map<String, Object> mapValue);
+
 
     //******************************************下拉框*******************************
     @GetMapping(value = "api/v1/rms/rmscapacity/getCapacityTypeId")

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

@@ -704,7 +704,12 @@
                BF.FORMULA_NAME   AS "formulaName",
                BF.FORMULA_STRING AS "formulaString"
         FROM BMSTRUCK_FORMULA BF
-        WHERE FORMULA_NAME LIKE #{con}
+        <where>
+            FORMULA_NAME like '%执行运价公式%'
+            <if test="con!=null">
+                and FORMULA_NAME LIKE #{con}
+            </if>
+        </where>
     </select>
 
     <select id="getBatchByLike" parameterType="string" resultType="java.util.Map">