修改列表

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

@@ -102,7 +102,8 @@ public class StatisticalReportController extends BaseRESTfulController {
                                           String carrierSsoId,
                                           String userId,
                                            String userIds,
-                                           String con
+                                           String con,
+                                           Integer orderType
     ){
         if(carrierSsoId != null) {
             if (!"null".equals(carrierSsoId)) {
@@ -112,6 +113,9 @@ public class StatisticalReportController extends BaseRESTfulController {
             if (userId!=null){
                 mapValue.put("userId",userId);
             }
+            if (orderType!=null){
+                mapValue.put("orderType",orderType);
+            }
             if (userIds!=null){
                 mapValue.put("userIds",userIds);
             }
@@ -143,7 +147,8 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                     String carrierSsoId,
                                                     String userId,
                                                     String userIds,
-                                                    String con
+                                                    String con,
+                                                    Integer orderType
     ){
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId)){
@@ -156,6 +161,9 @@ public class StatisticalReportController extends BaseRESTfulController {
         if (userId!=null){
             mapValue.put("userId",userId);
         }
+        if (orderType!=null){
+            mapValue.put("orderType",orderType);
+        }
         if (userIds!=null){
             mapValue.put("userIds",userIds);
         }

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

@@ -81,7 +81,7 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
             count++;
         }
         if (userId!=null){
-            mapValue.put("userid",userId);
+            mapValue.put("userId",userId);
             count++;
         }
         if (usersId!=null){

src/main/java/com/steerinfo/dil/mapper/StatisticalReportMapper.java

@@ -21,6 +21,6 @@ public interface StatisticalReportMapper {
 //    查询零星物资进厂统计报表
     List<Map<String, Object>> getSporadicSuppliesReport1(Map<String, Object> mapValue);
 
-    //    查询零星物资进厂统计报表
+    //    查询零星物资出厂统计报表
     List<Map<String, Object>> getSporadicSuppliesReport2(Map<String, Object> mapValue);
 }

src/main/resources/application-dev.yml

@@ -31,9 +31,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:192.168.1.102:8016}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:192.168.1.102:8006}
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/truckTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -349,6 +349,7 @@
         </if>
         <if test="con!=null">
             where  "receiveName" like #{con} or  "sendName" like #{con} or "materialName" like #{con}
+            or "capacityNumber" like #{con}
         </if>
         <if test="userId!=null">
             and ASO.INSERT_USERNAME=#{userId}
@@ -356,6 +357,9 @@
         <if test="userIds!=null">
             and ASO.UPDATE_USERNAME=#{userIds}
         </if>
+        <if test="orderType!=null">
+            and OO.ORDER_TYPE=#{orderType}
+        </if>
         )
         <where>
             <if test="orderNumber != null">
@@ -501,6 +505,7 @@
         </if>
         <if test="con!=null">
             where  "receiveName" like #{con} or  "sendName" like #{con} or "materialName" like #{con}
+           or "capacityNumber" like #{con}
         </if>
         <if test="userId!=null">
             and ASO.INSERT_USERNAME=#{userId}
@@ -508,6 +513,9 @@
         <if test="userIds!=null">
             and ASO.UPDATE_USERNAME=#{userIds}
         </if>
+        <if test="orderType!=null">
+            and OO.ORDER_TYPE=#{orderType}
+        </if>
         )
         <where>
             <if test="orderNumber != null">