liyg vor 2 Jahren
Ursprung
Commit
c1a347e043

+ 6 - 6
src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -99,13 +99,13 @@ public class StatisticalReportController extends BaseRESTfulController {
             }
         }
         if (receiveName != null && !"null".equals(receiveName)) {
-            mapValue.put("receivName","%" + receiveName + "%");
+            mapValue.put("receivName", receiveName);
         }
         if (materialName != null && !"".equals(materialName) && !"null".equals(materialName)) {
-            mapValue.put("remark","%" + materialName + "%");
+            mapValue.put("remark",materialName);
         }
         if (wareHouse != null && !"".equals(wareHouse) && !"null".equals(wareHouse)) {
-            mapValue.put("wareHouse","%" + wareHouse + "%");
+            mapValue.put("wareHouse",wareHouse);
         }
         mapValue.put("orderTypee",orderType);
         mapValue.put("shipperId",shipperId);
@@ -152,13 +152,13 @@ public class StatisticalReportController extends BaseRESTfulController {
             }
         }
         if (receiveName != null && !"null".equals(receiveName)) {
-            mapValue.put("receivName","%" + receiveName + "%");
+            mapValue.put("receivName",receiveName);
         }
         if (materialName != null && !"".equals(materialName) && !"null".equals(materialName)) {
-            mapValue.put("remark","%" + materialName + "%");
+            mapValue.put("remark", materialName);
         }
         if (wareHouse != null && !"".equals(wareHouse) && !"null".equals(wareHouse)) {
-            mapValue.put("wareHouse","%" + wareHouse + "%");
+            mapValue.put("wareHouse",wareHouse);
         }
         mapValue.put("orderTypee",orderType);
         mapValue.put("shipperId",shipperId);

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -93,7 +93,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResult.setSegmentSqe(DataChange.dataToBigDecimal(map.get("segmentSqe")));
         int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
         try{
-
+            tmstruckLoadResultMapper.clearRepeat(tmstruckLoadResult);
         }catch (Exception e){
             e.printStackTrace();
         }

+ 9 - 6
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -437,8 +437,8 @@
         <if test="carrierSsoId != null">
             and RC2.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
-        <if test="receivName != null">
-            and RCON.CONSIGNEE_COMPANY_NAME like #{receivName}
+        <if test="receivName != null and receivName != ''">
+            and RCON.CONSIGNEE_COMPANY_NAME like Concat('%',Concat(#{receivName},'%'))
         </if>
         <if test="oneDate != null and orderTypee == 1">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME
@@ -456,11 +456,14 @@
         </if>
         )
         <where>
-            <if test="remark != null">
-               and "likeRemark" like #{remark}
+            <if test="capacityNumber != null and capacityNumber != ''">
+                and "capacityNumber" like Concat('%',Concat(#{capacityNumber},'%'))
             </if>
-            <if test="wareHouse != null">
-                and "wareHouse" like #{wareHouse}
+            <if test="remark != null and remark != ''">
+               and "likeRemark" like Concat('%',Concat(#{remark},'%'))
+            </if>
+            <if test="wareHouse != null and wareHouse != ''">
+                and "wareHouse" like Concat('%',Concat(#{wareHouse},'%'))
             </if>
             <if test="materialName != null">
                 and