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

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/EmployeeDto.java

@@ -1,7 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.common.enums.UserGenderEnum;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
@@ -69,35 +68,15 @@ public class EmployeeDto {
     @ApiModelProperty(value = "社保部门id",required = false)
     private Integer deptId;
 
-    private String deptName;
-
     @ApiModelProperty(value = "OA部门ids",required = false)
     private String deptIds;
 
-    private String deptNames;
-
     @ApiModelProperty(value = "OA岗位ids",required = false)
     private String postIds;
 
     @ApiModelProperty(value = "岗位管理范围",required = false)
     private String postDeptIds;
 
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public String getDeptNames() {
-        return deptNames;
-    }
-
-    public void setDeptNames(String deptNames) {
-        this.deptNames = deptNames;
-    }
-
     public String getPositionNames() {
         return positionNames;
     }

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

@@ -10,7 +10,7 @@ public enum OrderDetailTypeEnum implements BaseEnum<String, OrderDetailTypeEnum>
     ACCESSORIES("ACCESSORIES", "辅件"),
     TEACHING("TEACHING", "教谱"),
     OTHER("OTHER", "其他"),
-    COURSE("COURSE", "课程"),
+    COURSE("COURSE", "乐团课"),
     HIGH_ONLINE_COURSE("HIGH_ONLINE_COURSE", "网络基础训练"),
     SINGLE("SINGLE", "声部课"),
     MIX("MIX", "合奏课"),

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

@@ -6,54 +6,54 @@ import com.ym.mec.common.enums.BaseEnum;
  * 订单类型(报名、续费、小课购买、其他)
  */
 public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
-	APPLY("APPLY", "报名"),
-	ADD_STUDENT("ADD_STUDENT","进行中加学员"),
-	RENEW("RENEW", "续费"),
-	SPORADIC("SPORADIC", "零星收费"),
-	OTHER("OTHER", "其他"),
-	SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "VIP购买"),
-	PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "网管课购买"),
-	PRACTICE_GROUP_RENEW("PRACTICE_GROUP_RENEW", "网管课续费"),
-	COURSE_GROUP_BUY("COURSE_GROUP_BUY","对外课程购买"),
-	LUCK("LUCK", "福袋活动"),
-	DOUBLE_ELEVEN2020("DOUBLE_ELEVEN2020","2020双十一活动"),
-	DOUBLE_ELEVEN2021("DOUBLE_ELEVEN2021","2021双十一活动"),
-	TENANT_RECHARGE("TENANT_RECHARGE","租户充值"),
-	GOODS_SELL("GOODS_SELL","商品销售"),
-	OUTORDER("OUTORDER", "外部订单"),
-	REPAIR("REPAIR","乐器维修"),
-	SUBJECT_CHANGE("SUBJECT_CHANGE","声部更换"),
-	DEGREE_REGISTRATION("DEGREE_REGISTRATION", "考级报名"),
-	MAINTENANCE("MAINTENANCE","乐保"),
-	REPLACEMENT("REPLACEMENT","乐器置换"),
-	DEGREE("DEGREE","6.1考级活动"),
-	ACTIVITY("ACTIVITY","活动排课"),
-	MEMBER("MEMBER", "购买会员");
-
-
-	private String code;
-
-	private String msg;
-
-	OrderTypeEnum(String code, String msg) {
-		this.code = code;
-		this.msg = msg;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-
-	@Override
-	public String getCode() {
-		return this.code;
-	}
+    APPLY("APPLY", "乐团报名"),
+    ADD_STUDENT("ADD_STUDENT", "乐团报名"),
+    RENEW("RENEW", "乐团续费"),
+    SPORADIC("SPORADIC", "缴费"),
+    OTHER("OTHER", "其他"),
+    SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "VIP课报名"),
+    PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "网管课报名"),
+    PRACTICE_GROUP_RENEW("PRACTICE_GROUP_RENEW", "网管课续费"),
+    COURSE_GROUP_BUY("COURSE_GROUP_BUY", "课程购买"),
+    LUCK("LUCK", "福袋活动"),
+    DOUBLE_ELEVEN2020("DOUBLE_ELEVEN2020", "2020双十一活动"),
+    DOUBLE_ELEVEN2021("DOUBLE_ELEVEN2021", "2021双十一活动"),
+    TENANT_RECHARGE("TENANT_RECHARGE", "账户充值"),
+    GOODS_SELL("GOODS_SELL", "商品购买"),
+    OUTORDER("OUTORDER", "导入订单"),
+    REPAIR("REPAIR", "乐器维修"),
+    SUBJECT_CHANGE("SUBJECT_CHANGE", "声部更换"),
+    DEGREE_REGISTRATION("DEGREE_REGISTRATION", "考级报名"),
+    MAINTENANCE("MAINTENANCE", "乐器保养"),
+    REPLACEMENT("REPLACEMENT", "乐器置换"),
+    DEGREE("DEGREE", "6.1考级活动"),
+    ACTIVITY("ACTIVITY", "活动购买"),
+    MEMBER("MEMBER", "会员购买");
+
+
+    private String code;
+
+    private String msg;
+
+    OrderTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
 }

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

@@ -225,9 +225,7 @@
         <result property="postalCode" column="postal_code_"/>
         <result property="organIdStr" column="organ_id_str_"/>
         <result property="deptId" column="dept_id_"/>
-        <result property="deptName" column="dept_name_"/>
         <result property="deptIds" column="dept_ids_"/>
-        <result property="deptNames" column="dept_names_"/>
         <result property="postIds" column="post_ids_"/>
         <result property="postDeptIds" column="post_dept_ids_"/>
         <collection property="roleNames" ofType="string" javaType="list">
@@ -241,11 +239,9 @@
         SELECT ue.*,ue.organ_id_ organ_id_str_,sr.role_name_,sr.id_ role_id_
         FROM (SELECT e.user_id_,su.real_name_,su.gender_,su.phone_,su.user_type_,e.job_nature_,su.lock_flag_,
         e.entry_date_,e.demission_date_,e.organ_id_list_ organ_id_,e.create_time_,e.contact_address_,
-        e.postal_code_,e.dept_id_,o.name_ dept_name_,e.dept_ids_,GROUP_CONCAT(o1.name_) dept_names_,e.post_ids_,e.post_dept_ids_
+        e.postal_code_,e.dept_id_,e.dept_ids_,e.post_ids_,e.post_dept_ids_
         FROM employee e
         LEFT JOIN sys_user su ON e.user_id_ = su.id_
-        LEFT JOIN organization o ON e.dept_id_ = o.id_
-        LEFT JOIN organization o1 ON e.dept_ids_ IS NOT NULL AND JSON_CONTAINS(CAST(e.dept_ids_ AS JSON),CAST(o1.id_ AS JSON))
         <if test="roleId != null">
             LEFT JOIN sys_user_role sur ON sur.user_id_ = e.user_id_
         </if>
@@ -273,7 +269,6 @@
                 AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') or su.id_ like CONCAT('%',#{search},'%'))
             </if>
         </where>
-        GROUP BY e.user_id_
         ORDER BY e.create_time_ DESC <include refid="global.limit"/>) ue
         LEFT JOIN sys_user_role sur ON sur.user_id_ = ue.user_id_
         LEFT JOIN sys_role sr ON sr.id_ = sur.role_id_