Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into mall_order_export

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/FeeProjectEnum.java

@@ -24,7 +24,11 @@ public enum FeeProjectEnum implements BaseEnum<Integer, FeeProjectEnum> {
     REFUND(19, "退费"),
     TEACHING_POINT_RENTAL(20, "教学点租赁"),
     MUSICAL_INSTRUMENT_REPAIR(21, "乐器维修"),
-    INTERNAL_SETTLEMENT(22, "内部结算");
+    INTERNAL_SETTLEMENT(22, "内部结算"),
+    MUSICAL(23, "乐器"),
+    COST_PARTS(24, "配件费"),
+    DEPOSIT(25, "押金"),
+    OTHER(26, "其他");
 
     private Integer code;
 

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

@@ -213,8 +213,8 @@
 		where #{month} BETWEEN DATE_FORMAT(orc.start_date_,'%Y-%m') AND DATE_FORMAT(orc.end_date_,'%Y-%m') AND orc.cloud_price_ > 0 AND orc.start_date_  IS NOT NULL;
 	</select>
 	<select id="sumRefundAmount" resultType="java.util.Map">
-		select suc.organ_id_ 'key',SUM(amount_) 'value' from sys_user_cash_account_log suc
-		where DATE_FORMAT(suc.create_time_,'%Y-%m') = #{month} AND suc.amount_ > 0 group by suc.organ_id_;
+		select organ_id_ 'key',SUM(amount_) 'value' from financial_expenditure where process_id_ IN (19,20,23) AND fee_project_ != 25
+		AND DATE_FORMAT(create_time_,'%Y-%m') = #{month} AND amount_ > 0 group by organ_id_;
 	</select>
 	<select id="sumVariableCosts" resultType="java.util.Map">
 		select fe.organ_id_ 'key',SUM(amount_) 'value' from financial_expenditure fe

mec-web/src/main/java/com/ym/mec/web/controller/education/OaContractsController.java

@@ -1,9 +1,6 @@
 package com.ym.mec.web.controller.education;
 
 import com.ym.mec.biz.dal.dto.OAFinancialDto;
-import com.ym.mec.biz.dal.dto.ReturnFeeDto;
-import com.ym.mec.biz.dal.entity.FinancialExpenditure;
-import com.ym.mec.biz.dal.entity.MusicGroupQuit;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.FinancialExpenditureService;
 import com.ym.mec.common.controller.BaseController;
@@ -11,9 +8,11 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Map;
 
 @RequestMapping()