值班、课程、班级的修改

backend/src/dashoo.cn/modi_webapi/app/api/course/course.go

@@ -1,10 +1,10 @@
 package course
 
 import (
-	"dashoo.cn/micro_libary/response"
 	"dashoo.cn/modi_webapi/app/model/course"
 	service "dashoo.cn/modi_webapi/app/service/course"
 	"dashoo.cn/modi_webapi/library/request"
+	"dashoo.cn/modi_webapi/library/response"
 	"fmt"
 	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/glog"
@@ -49,11 +49,11 @@ func (c *Controller) GetAllCourse(r *ghttp.Request) {
 			response.Json(r, 0, "")
 			return
 		}
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, err.Error())
 	} else {
 		count, err1 := course.FindCourseCount(where)
 		if err1 != nil {
-			response.Json(r, -1, err1.Error())
+			response.Json(r, 1, err1.Error())
 		} else {
 			var records response.PagedRecords
 			records.Total = count
@@ -70,7 +70,7 @@ func (c *Controller) DeleteCourse(r *ghttp.Request) {
 		response.Json(r, 1, err.Error())
 		r.ExitAll()
 	} else {
-		response.Json(r, 0, "该记录已删除！")
+		response.Json(r, 0, "删除成功！")
 	}
 }
 
@@ -81,7 +81,7 @@ func (c *Controller) AddCourse(r *ghttp.Request) {
 	var addOrUpdateReq *course.Entity
 	// 赋值并// 校验参数
 	if err := r.Parse(&addOrUpdateReq); err != nil {
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, err.Error())
 	}
 
 	// 初始化学生service
@@ -102,7 +102,7 @@ func (c *Controller) AddCourse(r *ghttp.Request) {
 		if newId, err := servcie.Add(addOrUpdateReq); err != nil {
 			response.Json(r, 1, err.Error())
 		} else {
-			response.Json(r, 0, "新建成功", newId)
+			response.Json(r, 0, "添加成功", newId)
 		}
 	}
 
@@ -124,7 +124,7 @@ func (c *Controller) GetDetailById(r *ghttp.Request) {
 	if information, err := servcie.GetByID(id); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", information)
+		response.Json(r, 0, "", information)
 	}
 
 }

backend/src/dashoo.cn/modi_webapi/app/api/duty/duty.go

@@ -1,11 +1,11 @@
 package duty
 
 import (
-	"dashoo.cn/micro_libary/response"
 	"dashoo.cn/modi_webapi/app/common"
 	"dashoo.cn/modi_webapi/app/model/duty"
 	dutyService "dashoo.cn/modi_webapi/app/service/duty"
 	"dashoo.cn/modi_webapi/library/request"
+	"dashoo.cn/modi_webapi/library/response"
 	"github.com/gogf/gf/net/ghttp"
 )
 
@@ -55,7 +55,7 @@ func (c *DutyController) GetPageList(r *ghttp.Request) {
 		records.Size = page.Size
 		records.Total = total
 		records.Records = dutyList
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 }
 
@@ -71,7 +71,7 @@ func (c *DutyController) SaveDuty(r *ghttp.Request) {
 	// 初始化课程详情service
 	service, err := dutyService.NewDutyService(tenant)
 	if err != nil {
-		response.Json(r, -1, err.Error())
+		response.Json(r, 1, err.Error())
 	}
 	// 获取操作人
 	realName := r.GetParamVar("realname").String()
@@ -88,7 +88,7 @@ func (c *DutyController) SaveDuty(r *ghttp.Request) {
 		if newId, err := service.Add(entity); err != nil {
 			response.Json(r, 1, err.Error())
 		} else {
-			response.Json(r, 0, "新增成功", newId)
+			response.Json(r, 0, "添加成功", newId)
 		}
 	}
 
@@ -110,7 +110,7 @@ func (c *DutyController) GetDutyById(r *ghttp.Request) {
 	if duty, err := service.GetDutyById(Id); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", duty)
+		response.Json(r, 0, "", duty)
 	}
 
 }

backend/src/dashoo.cn/modi_webapi/app/model/course/course.go

@@ -5,17 +5,15 @@ import (
 	"github.com/gogf/gf/frame/g"
 )
 
-
 var (
 	recordsTable = g.DB().Table("course").Safe()
 )
 
-func GetAllCourse(page request.PageInfo, where string, result *[]Entity)(err error){
-	err = recordsTable.Where(where).Limit((page.Current-1)*page.Size, page.Size).Scan(result)
+func GetAllCourse(page request.PageInfo, where string, result *[]Entity) (err error) {
+	err = recordsTable.Where(where).Page(page.Current, page.Size).Order("CreatedTime desc").Scan(result)
 	return err
 }
 
-func FindCourseCount(where string)(int, error){
+func FindCourseCount(where string) (int, error) {
 	return recordsTable.Where(where).Count()
 }
-

backend/src/dashoo.cn/modi_webapi/app/model/duty/duty_entity.go

@@ -13,14 +13,14 @@ import (
 // Entity is the golang structure for table instrument.
 type Entity struct {
 	Id          int         `xorm:"not null pk autoincr INT(10)"` // id
-	Year        int         `xorm:"INT(10)" v:"required"`         // 学年
-	Term        string      `xorm:"VARCHAR(32)" v:"required"`     // 学期
-	Title       string      `xorm:"VARCHAR(32)" v:"required"`     // 标题
-	Status      string      `xorm:"VARCHAR(32)" v:"required"`     // 状态
+	Year        int         `xorm:"INT(10)"`                      // 学年
+	Term        string      `xorm:"VARCHAR(32)"`                  // 学期
+	Title       string      `xorm:"VARCHAR(32)"`                  // 标题
+	Status      string      `xorm:"VARCHAR(32)"`                  // 状态
 	CreatedBy   string      `xorm:"VARCHAR(32)"`                  // 创建人
-	CreatedTime *gtime.Time `xorm:"DATETIME created"`             // 创建时间
+	CreatedTime *gtime.Time `xorm:"DATETIME "`                    // 创建时间
 	UpdatedBy   string      `xorm:"VARCHAR(32)"`                  // 更新人
-	UpdatedTime *gtime.Time `xorm:"DATETIME updated"`             // 更新时间
+	UpdatedTime *gtime.Time `xorm:"DATETIME "`                    // 更新时间
 	IsDel       int         `xorm:"INT(10)"`                      // 删除标志
 
 }

backend/src/dashoo.cn/modi_webapi/app/service/duty/duty.go

@@ -41,7 +41,7 @@ func (s DutyService) GetPageList(param *duty.SelectPageReq) (list []*duty.Entity
 		return nil, -1, gerror.New("读取行数失败")
 	}
 	// 排序
-	orderby := "Id desc" // 默认排序
+	orderby := "CreatedTime desc" // 默认排序
 	// 列表查询
 	model = model.Page(int(param.Common.Page.Current), int(param.Common.Page.PagesSize)).Order(orderby)
 	var result []*duty.Entity

frontend_web/src/views/class/components/classadd.vue

@@ -28,11 +28,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="班级名称"
+          <el-form-item label="院系班级"
                         prop="Name"
                         label-width="120px">
             <el-input v-model="testlistform.Name"
-                      placeholder="请输入班级名称"
+                      placeholder="请输入院系班级"
                       style="width:100%"></el-input>
           </el-form-item>
         </el-col>
@@ -96,13 +96,13 @@ export default {
   methods: {
     init () {
       var myDate = new Date()
-      var year = myDate.getFullYear()// 获取当前年
+      var year = myDate.getFullYear() + 1 // 获取下一年
       this.initSelectYear(year)
       this.form.recentYear = year
     },
     initSelectYear (year) {
       this.years = []
-      for (let i = 0; i < 30; i++) {
+      for (let i = 0; i < 5; i++) {
         this.years.push({ value: (year - i), label: (year - i) + '年' })
       }
     },

frontend_web/src/views/class/components/classedit.vue

@@ -98,7 +98,7 @@ export default {
   },
   created () {
     var myDate = new Date()
-    var year = myDate.getFullYear()
+    var year = myDate.getFullYear() + 1 // 获取下一年
     this.initSelectYear(year)
   },
   methods: {
@@ -110,7 +110,7 @@ export default {
     },
     initSelectYear (year) {
       this.years = []
-      for (let i = 0; i < 30; i++) {
+      for (let i = 0; i < 5; i++) {
         this.years.push({ value: (year - i), label: (year - i) + '年' })
       }
     },

frontend_web/src/views/course/index.vue

@@ -9,9 +9,14 @@
                style="margin-top: -7px;text-align:right;">
         <el-form-item label="学年"
                       class="sbutton_margin">
-          <el-input style="width: 140px;"
-                    v-model="search.Year"
-                    placeholder="请输入"></el-input>
+          <el-select v-model="search.Year"
+                     placeholder="请选择年级学年">
+            <el-option v-for="item in years"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="学期"
                       class="sbutton_margin">
@@ -178,6 +183,7 @@ export default {
       classList: [], // 班级列表
       statusList: [], // 状态列表
       termList: [], // 学期
+      years: [],
       search: {
         Term: '',
         Year: '',
@@ -199,6 +205,9 @@ export default {
     this.getTerm()
     this.getStatus()
     this.initDatas()
+    var myDate = new Date()
+    var year = myDate.getFullYear() + 1 // 获取下年
+    this.initSelectYear(year)
   },
   methods: {
     // 匹配状态
@@ -262,6 +271,12 @@ export default {
         size: 10
       }
     },
+    initSelectYear (year) {
+      this.years = []
+      for (let i = 0; i < 5; i++) {
+        this.years.push({ value: (year - i), label: (year - i) + '年' })
+      }
+    },
     // 打开 添加弹窗
     openinformationadd () {
       this.$refs.courseDialog.dialogvisible = true
@@ -280,12 +295,25 @@ export default {
     },
     publish (course) {
       course.Status = 1
-      CourseApi.addCourse(course)
+      let params = {
+        Id: course.Id,
+        Status: 1
+      }
+      CourseApi.addCourse(params)
     },
     // 初始化列表数据
+
     initDatas () {
+      let params = {
+        // 分页信息
+        size: this.search.page.size,
+        current: this.search.page.current,
+        Year:  this.search.Year,
+        Term:  this.search.Term,
+        ClassId:  this.search.ClassId
+      }
       this.getClassList()
-      CourseApi.getPageList(this.search)
+      CourseApi.getPageList(params)
         .then(res => {
           this.activities = res.records
           this.search.page.total = res.total

frontend_web/src/views/duty/index.vue

@@ -161,9 +161,6 @@ export default {
       dutyId: -1,
       details: false,
       statusList: [],
-      totalsize: 0,
-      currpage: 1,
-      size: 10,
       term: [],
       activities: [],
       Year: '',
@@ -193,7 +190,7 @@ export default {
     this.getStatus()
     this.initDatas()
     var myDate = new Date()
-    var year = myDate.getFullYear()// 获取当前年
+    var year = myDate.getFullYear() +1 // 获取下年
     this.initSelectYear(year)
   },
   methods: {
@@ -245,8 +242,11 @@ export default {
       this.$refs.editDialog.dialogvisible = true
     },
     publish (duty) {
-      duty.Status = 1
-      DutyApi.saveDuty(duty)
+      let params = {
+        Id : duty.Id,
+        Status : 1
+      }
+      DutyApi.saveDuty(params)
     },
     // 打开二级页面
     handleDetail (duty) {
@@ -270,8 +270,8 @@ export default {
         _this.CalibrationTime = []
       }
       let params = {
-        _currentPage: this.currpage,
-        _size: this.size,
+        currentPage: this.search.page.current,
+        size: this.search.page.size,
         Year: this.search.Year,
         Term: this.search.Term,
         Title: this.search.Title,
@@ -285,12 +285,12 @@ export default {
         })
     },
     handleSizeChange (val) {
-      this.size = val
-      this.currpage = 1
+      this.search.page.size = val
+      this.search.page.currpage = 1
       this.initDatas()
     },
     handleCurrentChange (val) {
-      this.currpage = val
+      this.page.currpage = val
       this.initDatas()
     },
     jstimehandle (val) {
@@ -372,7 +372,7 @@ export default {
     },
     initSelectYear (year) {
       this.years = []
-      for (let i = 0; i < 30; i++) {
+      for (let i = 0; i < 5; i++) {
         this.years.push({ value: (year - i), label: (year - i) + '年' })
       }
     }