yonge 5 年之前
父节点
当前提交
5e43513d8d

+ 1 - 1
codegen/src/main/java/com/yonge/crud/CodegenApplication.java

@@ -28,7 +28,7 @@ public class CodegenApplication {
 		 */
 
 		// "src/generateConfigration.xml"
-		GenerateConfiguration genConfig = toObject("codegen/src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
+		GenerateConfiguration genConfig = toObject("src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
 
 		Configuration config = genConfig.getDbConfiguration();
 

+ 22 - 23
mec-web/src/main/java/com/ym/mec/web/dal/enums/ClassGroupTypeEnum.java

@@ -5,33 +5,32 @@ import com.ym.mec.common.enums.BaseEnum;
 /**
  * 班级类型(普通班级、合奏班级)
  */
-public enum ClassGroupTypeEnum implements BaseEnum<String,ClassGroupTypeEnum> {
-    COMMON("COMMON","普通班级"),
-    CONCERT("CONCERT","合奏班级"),
-    ENHANCE("ENHANCE","提高班");
+public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
+	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班");
 
-    private String code;
+	private String code;
 
-    private String msg;
+	private String msg;
 
-    ClassGroupTypeEnum(String code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
+	ClassGroupTypeEnum(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
 
-    public void setCode(String code) {
-        this.code = code;
-    }
+	public void setCode(String code) {
+		this.code = code;
+	}
 
-    public String getMsg() {
-        return msg;
-    }
+	public String getMsg() {
+		return msg;
+	}
 
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
 
-    @Override
-    public String getCode() {
-        return this.code;
-    }}
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+}

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/dal/enums/GoodsType.java

@@ -4,7 +4,7 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum GoodsType implements BaseEnum<String, GoodsType> {
 
-	INSTRUMENT("instrument", "乐器"), ACCESSORIES("accessories", "辅件"), MATERIAL("material", "教材");
+	INSTRUMENT("INSTRUMENT", "乐器"), ACCESSORIES("ACCESSORIES", "辅件"), MATERIAL("MATERIAL", "教材");
 
 	private String code;
 

+ 3 - 3
mec-web/src/main/java/com/ym/mec/web/dal/enums/JobNatureEnum.java

@@ -4,9 +4,9 @@ import com.ym.mec.common.enums.BaseEnum;
 
 //工作性质(兼职、全职)
 public enum JobNatureEnum implements BaseEnum<String,JobNatureEnum> {
-    PART_JOB("PART_JOB","兼职"),
-    FULL_JOB("FULL_JOB","全职"),
-    TEMPORARY_JOB("TEMPORARY_JOB","零时工");
+    PART_TIME("PART_TIME","兼职"),
+    FULL_TIME("FULL_TIME","全职"),
+    TEMPORARY("TEMPORARY","零时工");
 
     private String code;
 

+ 5 - 1
mec-web/src/main/java/com/ym/mec/web/dal/enums/MusicGroupStatusEnum.java

@@ -8,7 +8,7 @@ public enum  MusicGroupStatusEnum implements BaseEnum<String,MusicGroupStatusEnu
     PAY("PAY","缴费中"),
     PREPARE("PREPARE","筹备中"),
     UNDERWAY("UNDERWAY","进行中"),
-    CANCEL("CANCEL","取消");
+    CANCELED("CANCELED","取消");
 
     private String code;
     private String msg;
@@ -22,4 +22,8 @@ public enum  MusicGroupStatusEnum implements BaseEnum<String,MusicGroupStatusEnu
     public String getCode() {
         return this.code;
     }
+
+	public String getMsg() {
+		return msg;
+	}
 }

+ 36 - 0
mec-workflow/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.ym</groupId>
+		<artifactId>mec</artifactId>
+		<version>1.0</version>
+	</parent>
+	<artifactId>mec-workflow</artifactId>
+	<name>mec-workflow</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.github.snakerflow</groupId>
+			<artifactId>snaker-core</artifactId>
+			<version>2.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.snakerflow</groupId>
+			<artifactId>snaker-mybatis</artifactId>
+			<version>2.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.snakerflow</groupId>
+			<artifactId>snaker-spring</artifactId>
+			<version>2.5.1</version>
+		</dependency>
+	</dependencies>
+</project>

+ 1 - 0
pom.xml

@@ -312,5 +312,6 @@
 		<module>mec-web</module>
 		<module>cms</module>
 	  <module>mec-im</module>
+    <module>mec-workflow</module>
   </modules>
 </project>