luobang 1 gadu atpakaļ
vecāks
revīzija
200683efc0

+ 3 - 0
src/main/java/com/steerinfo/dil/service/impl/BmstruckStatementServiceImpl.java

@@ -78,6 +78,9 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
         BigDecimal excludeTax =  DataChange.dataToBigDecimal( map.get("excludeTax"));
         BigDecimal excludeTax =  DataChange.dataToBigDecimal( map.get("excludeTax"));
         String url = map.get("url").toString();
         String url = map.get("url").toString();
         //查询统计信息
         //查询统计信息
+        //List<Integer> orderList = (List<Integer>) map.get("orderList");
+        //HashSet set = new HashSet<>(orderList);
+        //map.put("orderList",set);
         Map<String,Object> count = bmstruckStatementMapper.getDetails(map);
         Map<String,Object> count = bmstruckStatementMapper.getDetails(map);
         //查询单位
         //查询单位
         List<Map<String, Object>> companys = bmstruckStatementMapper.getDetailIds(map);
         List<Map<String, Object>> companys = bmstruckStatementMapper.getDetailIds(map);

+ 15 - 10
src/main/resources/com/steerinfo/dil/mapper/BmstruckStatementMapper.xml

@@ -659,13 +659,18 @@
         FROM (
         FROM (
             SELECT
             SELECT
             BS.STATEMENT_ID "statementId",
             BS.STATEMENT_ID "statementId",
+            (SELECT sum(twr.result_net_weight) from bmstruck_details_order bdo
+            left join tmstruck_weight_result twr
+            on twr.WEIGHT_TASK_RESULT_ID = bdo.WEIGHT_TASK_RESULT_ID
+            where bdo.STATEMENT_ID = BS.STATEMENT_ID
+            and bdo.WETHER_TO_STATEMENT = 1) "totalNetWeight",
             BS.STATEMENT_NUMBER "statementNumber",
             BS.STATEMENT_NUMBER "statementNumber",
             BS.STATEMENT_EXCLUD_TAX "statementExcludTax",
             BS.STATEMENT_EXCLUD_TAX "statementExcludTax",
             BS.SUM_AMOUNT "sumAmout",
             BS.SUM_AMOUNT "sumAmout",
             BS.CAR_NUM "carNum",
             BS.CAR_NUM "carNum",
             RC.CONSIGNEE_COMPANY_NAME "consigneeName",
             RC.CONSIGNEE_COMPANY_NAME "consigneeName",
             RCA.CARRIER_NAME "carrierName",
             RCA.CARRIER_NAME "carrierName",
-            BS.STATEMENT_TIME || '--' || BS.STATEMENT_END_TIME "insertTime",
+            to_char(BS.STATEMENT_TIME,'yyyy-MM-dd') || '--' || to_char(BS.STATEMENT_END_TIME,'yyyy-MM-dd') "insertTime",
             BS.CONSIGNEE_ID "consigneeId",
             BS.CONSIGNEE_ID "consigneeId",
             BS .CARRIER_ID "carrierId"
             BS .CARRIER_ID "carrierId"
             FROM BMSTRUCK_STATEMENT BS
             FROM BMSTRUCK_STATEMENT BS
@@ -862,9 +867,9 @@
             SUM(BMSTRUCK_DETAILS_ORDER.DETAILS_AMOUNT) "sumAmount",
             SUM(BMSTRUCK_DETAILS_ORDER.DETAILS_AMOUNT) "sumAmount",
             COUNT(DISTINCT ORDER_ID) "carNum"
             COUNT(DISTINCT ORDER_ID) "carNum"
         FROM BMSTRUCK_DETAILS_ORDER
         FROM BMSTRUCK_DETAILS_ORDER
-        WHERE ORDER_ID IN
-        <foreach collection="orderList" item="orderId" open="(" close=")" separator=",">
-             #{orderId}
+        WHERE DETAILS_ID IN
+        <foreach collection="detailsIdList" item="detailsId" open="(" close=")" separator=",">
+             #{detailsId}
         </foreach>
         </foreach>
         and BMSTRUCK_DETAILS_ORDER.WETHER_TO_STATEMENT = 1
         and BMSTRUCK_DETAILS_ORDER.WETHER_TO_STATEMENT = 1
     </select>
     </select>
@@ -891,18 +896,18 @@
     <update id="batchUpdateDetails">
     <update id="batchUpdateDetails">
         UPDATE BMSTRUCK_DETAILS_ORDER
         UPDATE BMSTRUCK_DETAILS_ORDER
         SET STATEMENT_ID = #{statementId}
         SET STATEMENT_ID = #{statementId}
-        WHERE ORDER_ID IN
-        <foreach collection="orderList" item="orderId" open="(" close=")" separator=",">
-            #{orderId}
+        WHERE DETAILS_ID IN
+        <foreach collection="detailsIdList" item="detailsId" open="(" close=")" separator=",">
+            #{detailsId}
         </foreach>
         </foreach>
     </update>
     </update>
     <select id="getStatementIds" resultType="java.math.BigDecimal">
     <select id="getStatementIds" resultType="java.math.BigDecimal">
         SELECT
         SELECT
         DISTINCT STATEMENT_ID
         DISTINCT STATEMENT_ID
         FROM BMSTRUCK_DETAILS_ORDER
         FROM BMSTRUCK_DETAILS_ORDER
-        WHERE STATEMENT_ID IS NOT NULL AND ORDER_ID IN
-        <foreach collection="orderList" item="orderId" open="(" close=")" separator=",">
-            #{orderId}
+        WHERE STATEMENT_ID IS NOT NULL AND DETAILS_ID IN
+        <foreach collection="detailsIdList" item="detailsId" open="(" close=")" separator=",">
+            #{detailsId}
         </foreach>
         </foreach>
     </select>
     </select>
     <update id="updateAllBind">
     <update id="updateAllBind">