合并

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

@@ -1966,6 +1966,21 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getAllSaleReportTotal(mapValue==null?new HashMap<>():mapValue, startTime, endTime, carrierSsoId);
     }
 
+//    @ApiOperation(value="查询内转统计报表")
+//    @PostMapping("/getAllInwardResult")
+//    public Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                Integer apiId,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                String startTime, String endTime,
+//                                                String carrierSsoId
+//    ){
+//        return tmsTruckFeign.getAllInwardResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId);
+//    }
+
+
+
+
     @ApiOperation(value="查询零星物资进厂统计报表")
     @PostMapping("/getSporadicSuppliesReport1")
     public Map<String, Object> getSporadicSuppliesReport1(@RequestBody(required=false) Map<String,Object> mapValue,

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

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

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

@@ -414,6 +414,17 @@ public interface TmsTruckFeign {
                                                    @RequestParam("con") String con,
                                                    @RequestParam("orderType") Integer orderType
     );
+    //内转统计报表
+    @PostMapping("api/v1/truckTms/statisticalReport/getAllInwardResult")
+    Map<String, Object> getAllInwardResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime")   String endTime,
+                                         @RequestParam("carrierSsoId")   String carrierSsoId
+    );
+
 }
 
 

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

@@ -160,6 +160,10 @@
             <if test="index != null">
                 and (instr(RC.CAPACITY_NUMBER, #{index}) > 0 or instr(RCA.CARRIER_NAME, #{index}) > 0)
             </if>
+            <if test="con != null">
+                where "capacityNumber" like #{con} or "carrierName" like #{con} or
+                "remark" like #{con}
+            </if>
         )
         <where>
             <if test="capacityNumber != null">
@@ -173,6 +177,12 @@
                     "carrierName" like '%${item}%'
                 </foreach>
             </if>
+            <if test="remark != null">
+                and
+                <foreach collection="remark" item="item" open="(" separator="or" close=")">
+                    "remark" like '%${item}%'
+                </foreach>
+            </if>
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">