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

src/main/resources/application-prod.yml

@@ -50,4 +50,7 @@ openfeign:
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.33.166:8038}
 server:
-  port: 8088
+  port: 8088
+  tomcat:
+    max-threads: 1000
+    accept-count: 800

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

@@ -2228,8 +2228,8 @@
         END)
         "carrierName",
         OO.ORDER_NUMBER "orderNo",
-        ACTP.PRICE_VALUE AS "priceValue",
-        BDO.DETAILS_AMOUNT "detailsAmount",
+        TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
+        TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
         case
         when nvl(ASOM.HISTORY_SHIPPING_ADDRESS_ID,0) !=0
         then (select RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
@@ -2324,7 +2324,7 @@
         WHERE ASO.SALE_TYPE = 1
         AND ASO.DELETED = 0
         and ASM.SALE_MATERIAL_ID IS NOT NULL
-        and BDO.WETHER_TO_STATEMENT != 1
+        and (BDO.WETHER_TO_STATEMENT IS NULL or BDO.WETHER_TO_STATEMENT != 1)
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
         </if>
@@ -2439,6 +2439,12 @@
             0,'未上报') like '%${item}%'
         </foreach>
         </if>
+        <if test="saleOrderMaterialIds != null">
+            and  ASOM.SALE_ORDER_MATERIAL_ID IN
+          <foreach collection="saleOrderMaterialIds" item="item" open="(" separator="," close=")">
+          '${item}'
+          </foreach>
+        </if>
         order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID  DESC
         )
     </select>
@@ -2474,8 +2480,8 @@
         END)
         "carrierName",
         OO.ORDER_NUMBER "orderNo",
-        ACTP.PRICE_VALUE AS "priceValue",
-        BDO.DETAILS_AMOUNT "detailsAmount",
+        TO_CHAR(ACTP.PRICE_VALUE,'9999999990.99') AS "priceValue",
+        TO_CHAR(BDO.DETAILS_AMOUNT,'9999999990.99') "detailsAmount",
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
         RRP.PLACE_ID "placeId",