wanglm 4 роки тому
батько
коміт
a3a629bfa2

+ 4 - 4
src/main/resources/com/minpay/db/table/own/mapper/OrderManageMapper.xml

@@ -117,13 +117,13 @@
 	</select>
 <!--	累计收入-->
 	<select id="selectCountIncome" resultType="java.lang.String" parameterType="java.util.Map">
-		select SUM(PIF_TRXAMOUT)
+		select IFNULL(SUM(PIF_TRXAMOUT), 0.00)
 		from vm_payment_inf
 		where PIF_STATUS = '1'
 	</select>
 	<!--	总机台数-->
 	<select id="selectCountDevice" resultType="java.lang.String" parameterType="java.util.Map">
-		SELECT COUNT(VEQ_ID)
+		SELECT IFNULL(COUNT(VEQ_ID), 0.00)
 		FROM vm_equipment_inf
 		WHERE VEQ_STATE = '00'
 	</select>
@@ -147,14 +147,14 @@
 	</select>
 	<!--	总实际金额-->
 	<select id="selectAllSale" resultType="java.lang.String" parameterType="java.util.Map">
-		SELECT SUM(VOI_ORDER_AMT)
+		SELECT IFNULL(SUM(VOI_ORDER_AMT), 0.00)
 		FROM vm_order_inf
 		WHERE VOI_PRO_TYPE = '00'
 		AND VOI_STATE IN ('80', '00')
 	</select>
 	<!--	总商品成本-->
 	<select id="selectAllCost" resultType="java.lang.String" parameterType="java.util.Map">
-		SELECT SUM(proSum) FROM (
+		SELECT IFNULL(SUM(proSum), 0.00) FROM (
 			SELECT aa.PRT_PRO_COST * SUM(bb.VOD_PRO_NUMS) AS proSum
 			FROM vm_product_inf aa, vm_order_details bb
 			WHERE aa.PRT_ID = bb.VOD_PRODUCT_ID

+ 4 - 0
src/main/webapp/admin/salesDataManage/salesData.html

@@ -7,6 +7,10 @@
 </head>
 <body class="content">
 <div class="order-body">
+    <form class="layui-form"  action="javascript:void(0)"  id = "formName">
+        <div class="order-select back-border" id="content">
+        </div>
+    </form>
 </div>
 <div class="shadow-content" style="margin:1.5rem;">
     <table id="salesManage" lay-filter="tableFilter"></table>