提交代码

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

@@ -77,9 +77,13 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> qualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
-        DataChange.dataTo2Number(qualityResult, "resultDeduction");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,qualityResult);
-        return success(pageList);
+        if (qualityResult!=null){
+            DataChange.dataTo2Number(qualityResult, "resultDeduction");
+            PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,qualityResult);
+            return success(pageList);
+        }else {
+            return failed("数据为空");
+        }
     }
 
 

src/main/java/com/steerinfo/dil/service/impl/StatisticalReportImpl.java

@@ -74,7 +74,7 @@ public class StatisticalReportImpl implements IStatisticalReportService {
     @Override
     public List<Map<String, Object>> getAllSaleReport(Map<String, Object> map) {
         List<Map<String, Object>> mapList = statisticalReportMapper.getAllSaleReport(map);
-        for(Map<String, Object> map1 : mapList) {
+        /*for(Map<String, Object> map1 : mapList) {
             if ( map1.get("resultEntryGateTime") == null) {
                 map1.put("transportStatus", "未进厂");
                 continue;
@@ -95,7 +95,7 @@ public class StatisticalReportImpl implements IStatisticalReportService {
                 map1.put("transportStatus", "已签收");
             }
 
-        }
+        }*/
         for (Map<String, Object> mesMap : mapList) {
             calculateDifferenceTime(mesMap);
         }

src/main/java/com/steerinfo/dil/service/impl/TmstruckQualityResultServiceImpl.java

@@ -58,6 +58,8 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
             case 24:
             case 15:
             case 16:
+            case 17:
+            case 18:
                 return tmstruckQualityResultMapper.getInwardQualityResult(map); //apiId:150
             case 11:
                 break;

src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -124,6 +124,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 24:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnload2Result(map); //apiId:356
             case 11:
+                String con = (String) map.get("con");
+                if (con!=null){
+                    map.put("con","%"+con+"%");
+                }
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360
             case 12:
             case 13:

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -153,6 +153,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Override
     public List<Map<String, Object>> getAllJiPiResult(Map<String, Object> map) {
         Integer orderType = (Integer) map.get("orderTypee");
+        if (orderType==2){
+            String endDate = (String) map.get("endDate");
+            if (endDate!=null){
+                String s = endDate.replaceAll("00:00:00", "23:59:59");
+                map.put("endDate",s);
+            }
+        }
         switch (orderType){
             case 1:
             case 2:

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

@@ -363,7 +363,17 @@
         TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
         RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialCode",
         RM.MATERIAL_NAME  || TLR.INSERT_UPDATE_REMARK "likeRemark",
-        ASM.SALE_WAREHOUSE || RW.WAREHOUSE_NAME "wareHouse"
+        ASM.SALE_WAREHOUSE || RW.WAREHOUSE_NAME "wareHouse",
+        CASE
+        WHEN TER.RESULT_ENTRY_GATE_TIME IS NULL
+        THEN '未进厂'
+        when TLFR.RESULT_OUT_GATE_TIME IS NULL
+        THEN '已进厂'
+        when TAR.RESULT_ARRIVAL_ADDRESS IS NULL
+        THEN '已出厂'
+        WHEN TRR.RESULT_ARRIVAL_ADDRESS IS NULL
+        THEN '已抵达'
+        ELSE '已签收' END "transportStatus"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID

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

@@ -711,9 +711,6 @@
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">
       order by "${orderField}"
-      <if test="orderType != null and orderType != ''">
-        ${orderType}
-      </if>
     </if>
   </sql>
 
@@ -858,7 +855,7 @@
       </if>
     </where>
     <include refid="orderBy"></include>
-    <if test="orderField == null  ">
+    <if test="orderField == null">
       order by "insertTime" desc
     </if>
   </select>

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

@@ -1139,7 +1139,6 @@
         TWR.RESULT_POUND_NO "resultPoundNo",
         RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         RS.SHIPPER_NAME "shipperName"
-
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -1167,6 +1166,14 @@
         where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE in (1, 2)
         )
         <where>
+            <if test="startDate!=null">
+                to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=
+                to_date(to_char("resultTareWeightTime",'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
+            </if>
+            <if test="endDate!=null">
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=
+                to_date(to_char("resultTareWeightTime",'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
+            </if>
             <if test="purchaseOrderNo != null">
                 <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
                     "purchaseOrderNo" like '%${item}%'