tjyh

src/main/java/com/minpay/shouhuo/invCardManageAction.java

@@ -74,6 +74,7 @@ public class invCardManageAction implements IMINAction {
 	@MINAction(value = SELECT_INCOME_BYDATE)
 	public MINActionResult selectIncomeBydate (
 			@MINParam(key = "dateFlag") String dateFlag,
+			@MINParam(key = "datesTime") String datesTime,
 			MINSession session) throws Exception {
 		MINActionResult res = new MINActionResult();
 		User user = session.getUser();
@@ -112,8 +113,18 @@ public class invCardManageAction implements IMINAction {
 			Date  parseb = new SimpleDateFormat("yyyyMMdd").parse(dateStringb);
 			String  dateStringd = new SimpleDateFormat("yyyy-MM-dd").format(parseb);
 
-			 time = dateStringc.concat(" 至 ").concat(dateStringd);
+			time = dateStringc.concat(" 至 ").concat(dateStringd);
 			m.put("weekDate", dateString);
+		}else if("3".equals(dateFlag)) {
+			if(StringUtils.isNotEmpty(datesTime)) {
+				m.put("checkDate", datesTime);
+				time = datesTime.replace("-","至");
+			}else {
+				m.put("nowDate", nowDate);
+				Date  parse = new SimpleDateFormat("yyyyMMdd").parse(nowDate);
+				String  dateString = new SimpleDateFormat("yyyy-MM-dd").format(parse);
+				time = dateString;
+			}
 		}
 		if(!Constant.ADMINISTRATION_SYSTEM_NUMBER.equals(user.getBranchId())){
 			m.put("branchId",user.getBranchId());

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

@@ -260,6 +260,10 @@
 		<if test="branchId != null and branchId != ''">
 			AND	VOI_BRANCHID  = #{branchId,jdbcType=VARCHAR}
 		</if>
+		<if test="checkDate != null and checkDate != ''">
+			AND substr(PIF_SUCCTIME,1,8) between substr((#{checkDate, jdbcType=VARCHAR}),1,8)
+			AND substr((#{checkDate, jdbcType=VARCHAR}),12,19)
+		</if>
 	</select>
 	<!--成本-->
 	<select id="selectPredictIncome" resultType="java.lang.String" parameterType="java.util.Map">
@@ -282,6 +286,10 @@
 		<if test="branchId != null and branchId != ''">
 			AND	VOI_BRANCHID  = #{branchId,jdbcType=VARCHAR}
 		</if>
+		<if test="checkDate != null and checkDate != ''">
+			AND substr(PIF_SUCCTIME,1,8) between substr((#{checkDate, jdbcType=VARCHAR}),1,8)
+			AND substr((#{checkDate, jdbcType=VARCHAR}),12,19)
+		</if>
 	</select>
 	<!--	总机台数-->
 	<select id="selectCountDevice" resultType="java.lang.String" parameterType="java.util.Map">

src/main/webapp/admin/incomeStatisticsManage/incomeStatistics.html

@@ -123,7 +123,7 @@
 		        console.log(curr);
 		        //得到数据总量
 		        console.log(count);
-                wyyq(0);
+                wyyq(3);
 		      }
 		    ,even: true //开启隔行背景
         });
@@ -226,9 +226,11 @@
         }
     }
     function wyyq(aa) {
+        var dates = $("#dates").val();
         $.request({
             action : '../../invCardManageAction/selectIncomeBydate',
-            data : { dateFlag:aa},
+            data : { dateFlag:aa,
+                datesTime : dates},
             success : function(data) {
                 $("#countIncome").val(data.countIncome);
                 $("#predictIncome").val(data.predictIncome);
@@ -236,7 +238,6 @@
                 $("#time").val(data.time);
             }
         });
-        
     }
     function nowtime(){//将当前时间转换成yyyymmdd格式
         var mydate = new Date();