xubh 4 éve
szülő
commit
2d2aa51318

+ 2 - 2
src/main/resources/com/minpay/db/table/own/mapper/ShOrderMapper.xml

@@ -106,7 +106,7 @@
 	<select id="queryOrderStatisticsNew" resultType="hashmap" parameterType="java.lang.String">
 		SELECT
 		count(1)  number,
-		IFNULL(sum(d.VOD_AMOUNT),0)	sumAmt
+		IFNULL(ROUND(SUM(d.VOD_AMOUNT),2) , 0) sumAmt
 		FROM vm_order_details d LEFT JOIN   vm_order_inf a  ON d.VOD_ORDER_ID = a.VOI_ID
 		LEFT JOIN  vm_equipment_inf c ON a.VOI_EQUIPMENT_ID = c.VEQ_ID
 		LEFT JOIN vm_person_inf b ON a.VOI_PERSON_ID = b.VCI_ID
@@ -212,7 +212,7 @@
 			and d.VOD_IS_WINNING = #{isDraw,jdbcType=VARCHAR}
 		</if>
 		<if test="orderNo != null and orderNo != ''">
-			and d.VOD_DETAILS_ID = #{orderNo,jdbcType=VARCHAR}
+			and d.VOD_DETAILS_ID like CONCAT('%', #{orderNo,jdbcType=VARCHAR}, '%')
 		</if>
 		<if test="productName != null and productName != ''">
 			and d.VOD_PRO_NAME like CONCAT('%', #{productName,jdbcType=VARCHAR}, '%')

+ 1 - 1
src/main/webapp/admin/machineManage/editEquproduct.html

@@ -410,7 +410,7 @@
 	}
 	/*自定义处理数字*/
 	function zhzs(value) {
-		value = value.replace(/[^\d]/g, '').replace(/^0{1,}/g, '');
+		value = value.replace(/^0{1,}/g, '');
 		if (value != '')
 			value = parseFloat(value).toFixed(2);
 		else