Merge branch 'zx_saas_2022_degree' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeRegistrationServiceImpl.java

@@ -446,13 +446,13 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             params.put("offset", pageInfo.getOffset());
             dataList = degreeRegistrationDao.queryPage(params);
             DegreeRegistration degree = degreeRegistrationDao.getTotalAmount(params);
-            BigDecimal totalAmount = degree.getMoney() == null ? BigDecimal.ZERO : degree.getMoney();
+//            BigDecimal totalAmount = degree.getMoney() == null ? BigDecimal.ZERO : degree.getMoney();
 //            BigDecimal theoryLevelAmount = degree.getTheoryMoney() == null ? BigDecimal.ZERO : degree.getTheoryMoney();
 //            BigDecimal totalAmount = subjectLevelAmount.add(theoryLevelAmount);
             pageInfo.setApplyNum(degreeRegistrationDao.countApplyNum(params));
 //            pageInfo.setSubjectLevelAmount(subjectLevelAmount);
 //            pageInfo.setTheoryLevelAmount(theoryLevelAmount);
-            pageInfo.setTotalAmount(totalAmount);
+            pageInfo.setTotalAmount(degree.getMoney());
         }
         pageInfo.setRows(dataList);
         return pageInfo;

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

@@ -47,7 +47,7 @@
     <sql id="queryPageSql">
         <where>
             tenant_id_ =  #{tenantId}
-            <if test="organId != null">
+            <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(organ_id_,#{organId})
             </if>
             <if test="status != null">

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

@@ -1817,11 +1817,17 @@ public class ExportController extends BaseController {
         if (pageList.getTotal() <= 0) {
             throw new BizException("没有可导出的记录");
         }
+        Map<String,String> map = new HashMap<>(10);
+        map.put("一级","1");map.put("二级","2");map.put("三级","3");map.put("四级","4");map.put("五级","5");
+        map.put("六级","6");map.put("七级","7");map.put("八级","8");map.put("九级","9");map.put("十级","10");
+        for (DegreeRegistration row : pageList.getRows()) {
+            row.setActivityTag(map.get(row.getLevel()));
+        }
         OutputStream outputStream = response.getOutputStream();
         try {
-            String[] header = {"姓名", "性别", "身份证号", "城市", "学校", "报考乐器", "报考级别", "乐理级别", "乐理级别证书", "家长联系电话", "考级费用", "乐理费用", "备注", "缴费状态", "订单编号", "商户订单号", "报名时间"};
-            String[] body = {"name", "gender == 1?'男':'女'", "idcard", "city", "school", "subject", "level", "theoryLevel",
-                    "theoryCert", "mobile", "money", "theoryMoney", "memo", "status == 2?'已缴费':'未缴费'", "orderNo", "transNo", "createTime"};
+            String[] header = {"姓名", "性别", "身份证号", "城市", "学校", "报考乐器", "报考级别", "级别", "乐理级别证书", "家长联系电话", "考级费用","备注", "缴费状态", "订单编号", "商户订单号", "报名时间"};
+            String[] body = {"name", "gender == 1?'男':'女'", "idcard", "city", "school", "subject", "level","activityTag",
+                    "theoryCert", "mobile", "money", "memo", "status == 2?'已缴费':status == 3?'已退费':'未缴费'", "orderNo", "transNo", "createTime"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");

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

@@ -19,16 +19,14 @@ public class EduDegreeController extends BaseController {
 
     @Autowired
     private DegreeRegistrationService degreeRegistrationService;
-    @Autowired
-    private OrganizationService organizationService;
 
 
     @ApiOperation(value = "查询收费列表")
     @GetMapping("/queryPage")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
-        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("DESC");
+        queryInfo.setTenantId(1);
         return succeed(degreeRegistrationService.getPageList(queryInfo));
     }