Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -852,7 +852,7 @@ public class StatisticalReportController extends BaseRESTfulController {
             map.put("salers",saler);
         }
         if (easPrimaryId != null && !"".equals(easPrimaryId) && !"null".equals(easPrimaryId)) {
-            map.put("easPrimaryId",easPrimaryId);
+            map.put("easPrimaryId","%" + easPrimaryId+ "%");
         }
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getSaleSteelReportNew(map);
@@ -971,7 +971,7 @@ public class StatisticalReportController extends BaseRESTfulController {
             map.put("salers",saler);
         }
         if (easPrimaryId != null && !"".equals(easPrimaryId) && !"null".equals(easPrimaryId)) {
-            map.put("easPrimaryId",easPrimaryId);
+            map.put("easPrimaryId","%" +easPrimaryId+ "%");
         }
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getSettledSaleSteelReportNew(map);

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

@@ -2406,7 +2406,7 @@
             and RSR.SALER_NAME = #{salers}
         </if>
         <if test="easPrimaryId != null">
-            and ASM.EAS_PRIMARY_ID = #{easPrimaryId}
+            and ASM.EAS_PRIMARY_ID like #{easPrimaryId}
         </if>
         <if test="capacityNum != null">
             and  RCA.CAPACITY_NUMBER like #{capacityNum}
@@ -2679,7 +2679,7 @@
             and RSR.SALER_NAME = #{salers}
         </if>
         <if test="easPrimaryId != null">
-            and ASM.EAS_PRIMARY_ID = #{easPrimaryId}
+            and ASM.EAS_PRIMARY_ID like #{easPrimaryId}
         </if>
         <if test="capacityNum != null">
             and  RCA.CAPACITY_NUMBER like #{capacityNum}