update

mec-biz/src/main/resources/config/mybatis/SysUserCashAccountDetailMapper.xml

@@ -126,6 +126,11 @@
 	</select>
 	
 	<select id="queryStatistics" resultType="map">
-		select sum(case when amount_ &gt; 0 then 1 else 0 end) income_num_,sum(case when amount_ &gt; 0 then amount_ else 0 end) income_total_,sum(case when amount_ &lt; 0 then 1 else 0 end) expend_num_,sum(case when amount_ &lt; 0 then amount_ else 0 end) expend_total_ from sys_user_cash_account_detail where status_ = 'SUCCESS'
+		select sum(case when sucad.type_ = 'RECHARGE' then 1 else 0 end) income_num_,sum(case when sucad.type_ = 'RECHARGE' then sucad.amount_ else 0 end) income_total_,sum(case when (sucad.type_ = 'WITHDRAW' or sucad.type_ = 'REWARDS' or sucad.type_ = 'WAGE') then 1 else 0 end) expend_num_,sum(case when (sucad.type_ = 'WITHDRAW' or sucad.type_ = 'REWARDS' or sucad.type_ = 'WAGE') then sucad.amount_ else 0 end) expend_total_ from sys_user_cash_account_detail sucad
+		left join sys_user u on sucad.user_id_ = u.id_
+		where sucad.status_ = 'SUCCESS'
+		<if test="organId != null">
+   			and u.organ_id_ = #{organId}
+   		</if>
 	</select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/IndexController.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -44,6 +45,7 @@ public class IndexController extends BaseController {
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 	
+	@Autowired
 	private SysUserCashAccountDetailDao sysUserCashAccountDetailDao;
 
 	@ApiOperation(value = "获取首页数据")
@@ -77,8 +79,19 @@ public class IndexController extends BaseController {
 		Integer demoGroupNum = demoGroupDao.queryCurrentMonthCoursesNum(organId);
 		
 		Map<String, Object> incomeExpendMap = sysUserCashAccountDetailDao.queryStatistics();
+		
+		ModelMap model = new ModelMap();
+		model.put("musicDatas", musicDatas);
+		model.put("teacherDatas", teacherDatas);
+		model.put("studentDatas", studentDatas);
+		model.put("vipDatas", vipDatas);
+		model.put("demoDatas", demoDatas);
+		model.put("musicGroupNum", musicGroupNum);
+		model.put("vipGroupNum", vipGroupNum);
+		model.put("demoGroupNum", demoGroupNum);
+		model.put("incomeExpendMap", incomeExpendMap);
 
-		return succeed();
+		return succeed(model);
 	}
 
 }