2018.04.21 剩余接口基本完成

yangcedrus · Apr 21, 2018 · 3dbf34d · 3dbf34d
1 parent 51213ea
commit 3dbf34d
Show file tree

Hide file tree

Showing 38 changed files with 2,358 additions and 270 deletions.
diff --git a/QingXie/mbg.xml b/QingXie/mbg.xml
@@ -21,26 +21,26 @@
 
 		<!-- 指定javabean的生成位置 -->
 
-		<javaModelGenerator targetPackage="com.selfcreate.qingxie.bean.activity"
+		<javaModelGenerator targetPackage="com.selfcreate.qingxie.bean.user"
 			targetProject=".\src\main\java">
 			<property name="enableSubPackages" value="true" />
 			<property name="trimStrings" value="true" />
 		</javaModelGenerator>
 
 		<!-- 指定sql映射文件的生成位置 -->
 
-		<sqlMapGenerator targetPackage="mapper.activity" targetProject=".\src\main\resources">
+		<sqlMapGenerator targetPackage="mapper.user" targetProject=".\src\main\resources">
 			<property name="enableSubPackages" value="true" />
 		</sqlMapGenerator>
 
 		<!-- 指定dao接口的生成位置 mapper接口 -->
 		<javaClientGenerator type="XMLMAPPER"
-			targetPackage="com.selfcreate.qingxie.dao.activity" targetProject=".\src\main\java">
+			targetPackage="com.selfcreate.qingxie.dao.user" targetProject=".\src\main\java">
 			<property name="enableSubPackages" value="true" />
 		</javaClientGenerator>
 
 		<!-- 此处添加新建的表 -->
-		<table tableName="activity" domainObjectName="Activity">
+		<table tableName="view_user_activity_hours" domainObjectName="UserActivityHoursVw">
 		</table>
 		<!-- <table tableName="activity_details_picture" domainObjectName="ActivityDetailsPicture">
 			<property name="useActualColumnNames" value="true"></property>

diff --git a/QingXie/src/main/java/com/selfcreate/qingxie/bean/activity/Activity.java b/QingXie/src/main/java/com/selfcreate/qingxie/bean/activity/Activity.java
@@ -196,4 +196,13 @@ public String getHomepagePic() {
     public void setHomepagePic(String homepagePic) {
         this.homepagePic = homepagePic == null ? null : homepagePic.trim();
     }
+
+	@Override
+	public String toString() {
+		return "Activity [id=" + id + "]";
+	}
+
+
+
+
 }
diff --git a/QingXie/src/main/java/com/selfcreate/qingxie/bean/user/UserActivityHours.java b/QingXie/src/main/java/com/selfcreate/qingxie/bean/user/UserActivityHours.java
@@ -2,13 +2,43 @@
 
 import java.util.Date;
 
-public class UserActivityHours extends UserActivityHoursKey {
+public class UserActivityHours {
+    private Integer id;
+
+    private Integer userId;
+
+    private Integer activityId;
+
     private Integer voluntaryHours;
 
     private Integer isConfirm;
 
     private Date createTime;
 
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
     public Integer getVoluntaryHours() {
         return voluntaryHours;
     }

diff --git a/QingXie/src/main/java/com/selfcreate/qingxie/bean/user/UserActivityHoursExample.java b/QingXie/src/main/java/com/selfcreate/qingxie/bean/user/UserActivityHoursExample.java
@@ -105,6 +105,66 @@ protected void addCriterion(String condition, Object value1, Object value2, Stri
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
         public Criteria andUserIdIsNull() {
             addCriterion("user_id is null");
             return (Criteria) this;

diff --git a/QingXie/src/main/java/com/selfcreate/qingxie/bean/user/UserActivityHoursKey.java b/QingXie/src/main/java/com/selfcreate/qingxie/bean/user/UserActivityHoursKey.java
diff --git a/QingXie/src/main/java/com/selfcreate/qingxie/bean/user/UserActivityHoursVw.java b/QingXie/src/main/java/com/selfcreate/qingxie/bean/user/UserActivityHoursVw.java
@@ -0,0 +1,103 @@
+package com.selfcreate.qingxie.bean.user;
+
+public class UserActivityHoursVw {
+    private Integer id;
+
+    private Integer userId;
+
+    private String userName;
+
+    private Integer classId;
+
+    private String className;
+
+    private Integer activityId;
+
+    private String activityName;
+
+    private Integer count;
+
+    private Integer voluntaryHours;
+
+    private Integer isConfirm;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName == null ? null : userName.trim();
+    }
+
+    public Integer getClassId() {
+        return classId;
+    }
+
+    public void setClassId(Integer classId) {
+        this.classId = classId;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className == null ? null : className.trim();
+    }
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getActivityName() {
+        return activityName;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName == null ? null : activityName.trim();
+    }
+
+    public Integer getCount() {
+        return count;
+    }
+
+    public void setCount(Integer count) {
+        this.count = count;
+    }
+
+    public Integer getVoluntaryHours() {
+        return voluntaryHours;
+    }
+
+    public void setVoluntaryHours(Integer voluntaryHours) {
+        this.voluntaryHours = voluntaryHours;
+    }
+
+    public Integer getIsConfirm() {
+        return isConfirm;
+    }
+
+    public void setIsConfirm(Integer isConfirm) {
+        this.isConfirm = isConfirm;
+    }
+}