Merge remote-tracking branch 'origin/master' into master

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

@@ -1,7 +1,9 @@
 package personnel
 
 import (
-	"dashoo.cn/modi_webapi/app/service/personnel"
+	//"dashoo.cn/micro_libary/response"
+	"dashoo.cn/modi_webapi/app/model/personnel"
+	service "dashoo.cn/modi_webapi/app/service/personnel"
 	"dashoo.cn/modi_webapi/library/request"
 	"dashoo.cn/modi_webapi/library/response"
 	"fmt"
@@ -13,12 +15,20 @@ import (
 type Controller struct {
 }
 
-func (c *Controller) GetAllPersonnel(r *ghttp.Request){
+func (c *Controller) GetAllPersonnel(r *ghttp.Request) {
+	// tenant 租户模式
+	tenant := r.Header.Get("Tenant")
+	// 初始化service
+	service, err := service.NewPersonnelService(tenant)
+	if err != nil {
+		response.Json(r, 1, err.Error())
+	}
+
 	page := request.GetPageInfo(r)
 	where := ""
 
-	if name := r.GetString("Name"); name != ""{
-		if where == ""{
+	if name := r.GetString("Name"); name != "" {
+		if where == "" {
 			where = fmt.Sprintf(" PersonnelName LIKE '%%%v%%'", name)
 		} else {
 			where += fmt.Sprintf(" AND PersonnelName LIKE '%%%v%%'", name)
@@ -26,14 +36,14 @@ func (c *Controller) GetAllPersonnel(r *ghttp.Request){
 	}
 
 	var result []personnel.Entity
-	if err := personnel.GetAllPersonnel(page, where, &result); err != nil{
-		if err.Error() == "sql: no rows in result set"{
+	if err := service.GetAllPersonnel(page, where, &result); err != nil {
+		if err.Error() == "sql: no rows in result set" {
 			response.Json(r, 0, "")
 			return
 		}
 		response.Json(r, -1, err.Error())
-	}else {
-		count, err1 := personnel.FindPersonnelCount(where)
+	} else {
+		count, err1 := service.FindPersonnelCount(where)
 		if err1 != nil {
 			response.Json(r, -1, err1.Error())
 		} else {
@@ -47,13 +57,12 @@ func (c *Controller) GetAllPersonnel(r *ghttp.Request){
 	}
 }
 
-
-func (c *Controller) GetOnePersonnel(r *ghttp.Request){
+func (c *Controller) GetOnePersonnel(r *ghttp.Request) {
 	id := r.GetInt("id")
 	if result, err := personnel.FindOne(id); err != nil {
 		response.Json(r, 1, err.Error())
 		r.ExitAll()
-	}else {
+	} else {
 		var records response.PagedRecords
 		records.Records = result
 		response.Json(r, 0, "", records)
@@ -61,9 +70,9 @@ func (c *Controller) GetOnePersonnel(r *ghttp.Request){
 
 }
 
-func (c *Controller) AddPersonnel(r *ghttp.Request){
+// 添加
+func (c *Controller) AddPersonnel(r *ghttp.Request) {
 	Personnel := new(personnel.Entity)
-	fmt.Println("---Personnel---",Personnel)
 	if err := r.Parse(Personnel); err != nil {
 		// 数据验证错误
 		if v, ok := err.(*gvalid.Error); ok {
@@ -74,8 +83,16 @@ func (c *Controller) AddPersonnel(r *ghttp.Request){
 		response.Json(r, 1, err.Error())
 		r.ExitAll()
 	}
+	// tenant 租户模式
+	tenant := r.Header.Get("Tenant")
+	// 初始化service
+	service, err := service.NewPersonnelService(tenant)
+	if err != nil {
+		response.Json(r, 1, err.Error())
+	}
+
 	// 查询code是否存在
-	info, _ := personnel.GetPersonnelByCode(Personnel.PersonneCode)
+	info, _ := service.GetPersonnelByCode(Personnel.PersonneCode)
 	if info != nil {
 		response.Json(r, 1, "人员编号已存在")
 	}
@@ -91,7 +108,7 @@ func (c *Controller) AddPersonnel(r *ghttp.Request){
 	Personnel.ModifiedBy = realName
 	Personnel.ModifiedUserId = userId
 
-	if result,err := personnel.Insert(Personnel); err != nil {
+	if result, err := personnel.Insert(Personnel); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
 		var records response.PagedRecords
@@ -102,7 +119,10 @@ func (c *Controller) AddPersonnel(r *ghttp.Request){
 	}
 }
 
-func (c *Controller) UpdatePersonnel(r *ghttp.Request){
+// 更新
+func (c *Controller) UpdatePersonnel(r *ghttp.Request) {
+	// tenant 租户模式
+	tenant := r.Header.Get("Tenant")
 	Personnel := new(personnel.Entity)
 	if err := r.Parse(Personnel); err != nil {
 		// 数据验证错误
@@ -122,21 +142,25 @@ func (c *Controller) UpdatePersonnel(r *ghttp.Request){
 	Personnel.ModifiedOn = currentTime
 	Personnel.ModifiedBy = realName
 	Personnel.ModifiedUserId = userId
-
-	if _,err := personnel.Replace(Personnel); err != nil {
+	// 初始化service
+	service, err := service.NewPersonnelService(tenant)
+	if err != nil {
 		response.Json(r, 1, err.Error())
+	}
+
+	// 修改
+	code, msg := service.UpdatePersonnelById(Personnel)
+	if code {
+		response.Json(r, 0, msg)
 	} else {
-		var records response.PagedRecords
-		//id, _ := result.LastInsertId()
-		//theChargeRecord.Id = int(id)
-		records.Records = Personnel
-		response.Json(r, 0, "", records)
+		response.Json(r, -1, msg)
 	}
 }
 
-func (c *Controller) DeletePersonnel(r *ghttp.Request){
+// 删除
+func (c *Controller) DeletePersonnel(r *ghttp.Request) {
 	id := r.GetInt("id")
-	if _,err := personnel.Delete(fmt.Sprintf("Id=%v", id)); err != nil{
+	if _, err := personnel.Delete(fmt.Sprintf("Id=%v", id)); err != nil {
 		response.Json(r, 1, err.Error())
 		r.ExitAll()
 	} else {

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

@@ -0,0 +1 @@
+package personnel

backend/src/dashoo.cn/modi_webapi/app/service/personnel/personnel_model.go → backend/src/dashoo.cn/modi_webapi/app/model/personnel/personnel_model.go

@@ -366,4 +366,4 @@ func (m *arModel) Chunk(limit int, callback func(entities []*Entity, err error)
 		return callback(entities, err)
 	})
 
-}
+}

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

@@ -5,27 +5,52 @@
 package personnel
 
 import (
+	"dashoo.cn/micro_libary/db"
+	"dashoo.cn/modi_webapi/app/model/personnel"
 	"dashoo.cn/modi_webapi/library/request"
-	"github.com/gogf/gf/frame/g"
+	"fmt"
 )
 
-var (
-	recordsTable = g.DB().Table("personnel").Safe()
-)
+type PersonnelService struct {
+	db.ServiceBase
+}
+
+// NewPersonnelService 初始化CourseService
+func NewPersonnelService(tenant string) (PersonnelService, error) {
+	var servcie PersonnelService
+	err := servcie.Init(tenant, personnel.Table)
+	return servcie, err
+}
 
-func GetAllPersonnel(page request.PageInfo, where string, result *[]Entity)(err error){
-	err = recordsTable.Where(where).Limit((page.Current-1)*page.Size, page.Size).Scan(result)
+func (s PersonnelService) GetAllPersonnel(page request.PageInfo, where string, result *[]personnel.Entity) (err error) {
+	err = s.SafeModel.Where(where).Limit((page.Current-1)*page.Size, page.Size).Scan(result)
 	return err
 }
 
-func FindPersonnelCount(where string)(int, error){
-	return recordsTable.Where(where).Count()
+//
+func (s PersonnelService) FindPersonnelCount(where string) (int, error) {
+	return s.SafeModel.Where(where).Count()
 }
 
 // 根据Code查询
-func GetPersonnelByCode(Code string) (res *Entity, err error){
-	model := recordsTable.Where("PersonneCode", Code)
-	var result *Entity
+func (s PersonnelService) GetPersonnelByCode(Code string) (res *personnel.Entity, err error) {
+	model := s.SafeModel.Where("PersonneCode", Code)
+	var result *personnel.Entity
 	err = model.Struct(&result)
 	return result, nil
 }
+
+// 更新
+func (s PersonnelService) UpdatePersonnelById(param *personnel.Entity) (code bool, msg string) {
+	// 先查询除了自己，当前Code是否存在
+	where := fmt.Sprintf(" PersonneCode = %v And Id <> %v", param.PersonneCode, param.Id)
+	count, _ := s.FindPersonnelCount(where)
+	if count > 0 {
+		return false, "人员编号已存在！"
+	}
+	_, err := s.SafeModel.Where("Id", param.Id).Data(param).Update()
+	if err != nil {
+		return false, err.Error()
+	}
+	return true, "更新成功"
+}

frontend_web/src/views/course/detail/editForm.vue

@@ -104,6 +104,7 @@ export default {
       dialogVisible: false,
       checkedTimes: [],
       Teachers: [],
+      TimeList: [],
       formdata: {
         Id: '',
         CourseId: '',

frontend_web/src/views/course/detail/index.vue

@@ -209,7 +209,6 @@ export default {
           .then(res => {
             _this.loading = false
             this.TeacherList = res
-            this.initData()
           })
           .catch(err => {
             console.error(err)

frontend_web/src/views/duty/detail/index.vue

@@ -68,8 +68,9 @@
                    style="margin-left:10px"
                    @click="addDuytDetail()">保存</el-button>
         <el-button size="mini"
+                   type="warning"
                    style="margin-right:6px"
-                   @click="closeWindow()">关闭</el-button>
+                   @click="closePage()">关闭</el-button>
       </el-form>
     </template>
     <el-table :data="list"
@@ -155,8 +156,6 @@
 </template>
 <script>
 // 总列数
-import DutyApi from '@/api/duty'
-import itemDetailApi from '@/api/sysadmin/itemdetail'
 const columnNum = 9
 // 固定列数
 const fixRowHeadNum = 2
@@ -172,6 +171,9 @@ const columnProperty = [
   'Saturday',
   'Sunday'
 ]
+import { mapState, mapActions } from 'vuex'
+import DutyApi from '@/api/duty'
+import itemDetailApi from '@/api/sysadmin/itemdetail'
 export default {
   name: 'dutyEdit',
   data () {
@@ -200,6 +202,12 @@ export default {
       list: []
     }
   },
+  computed: {
+    ...mapState('d2admin/page', [
+      'opened',
+      'current' // 用户获取当前页面的地址，用于关闭
+    ])
+  },
 
   mounted () {
     this.getLocal()
@@ -439,9 +447,14 @@ export default {
         }
       }
     },
-    // 关闭当前页
-    closeWindow () {
-      window.location.href = './#/duty'
+    // 关闭页面
+    ...mapActions('d2admin/page', [
+      'close'
+    ]),
+    // 关闭
+    closePage () {
+      let tagName = this.current
+      this.close({ tagName })
     }
   }
 }

frontend_web/src/views/duty/index.vue

@@ -4,12 +4,19 @@
       <el-form size="mini"
                ref="form"
                :inline="true"
-               class="sbutton_padding">
+               class="sbutton_padding"
+               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">
@@ -22,6 +29,12 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="标题"
+                      class="sbutton_margin">
+            <el-input style="width: 140px;"
+                      v-model="search.Title"
+                      placeholder="请输入标题"></el-input>
+        </el-form-item>
         <el-button size="mini"
                    type="primary"
                    @click="initDatas()"
@@ -154,12 +167,14 @@ export default {
       term: [],
       activities: [],
       Year: '',
+      years: [],
       Title: '',
       Time: '',
       Status: '',
       search: {
         Term: '',
         Year: '',
+        Title: '',
         page: {
           total: 0,
           current: 1,
@@ -177,6 +192,9 @@ export default {
     this.getTerm()
     this.getStatus()
     this.initDatas()
+    var myDate = new Date()
+    var year = myDate.getFullYear()// 获取当前年
+    this.initSelectYear(year)
   },
   methods: {
     // 获取学期
@@ -256,6 +274,7 @@ export default {
         _size: this.size,
         Year: this.search.Year,
         Term: this.search.Term,
+        Title: this.search.Title,
         Order: this.search.Order,
         Prop: this.search.Prop
       }
@@ -350,6 +369,12 @@ export default {
       this.search.classification = ''
       this.CalibrationTime = []
       this.initDatas()
+    },
+    initSelectYear (year) {
+      this.years = []
+      for (let i = 0; i < 30; i++) {
+        this.years.push({ value: (year - i), label: (year - i) + '年' })
+      }
     }
 
   }

frontend_web/src/views/personnel/components/personneledit.vue

@@ -81,8 +81,6 @@
 </template>
 
 <script>
-import axios from 'axios'
-import uploadajax from '@/assets/js/uploadajax.js'
 import PersonnelApi from '@/api/personnel'
 
 export default {
@@ -144,78 +142,30 @@ export default {
   created () {
   },
   methods: {
-    // 操作规程文件上传
-    uploadrequest (option) {
+    savedata () {
       let _this = this
-      axios.post(this.$uploadFile, {})
-        .then(function (res) {
-          if (res.data && res.data.fid && res.data.fid !== '') {
-            option.action = `http://${res.data.url}/${res.data.fid}`
-            _this.uploadFile = {
-              uid: option.file.uid,
-              url: res.data.publicUrl,
-              fid: res.data.fid
-            }
-            uploadajax(option)
+      PersonnelApi.UpdatePersonnel(this.testlistform)
+        .then(res => {
+          console.log(res.data)
+          if (res.data.code === 0) {
+            // _this.$message({
+            //   type: 'success',
+            //   message: res.data.message
+            // })
+            this.dialogvisible = false
+            this.fileList = []
+            // 刷新
+            this.$emit('closeEditDialog')
           } else {
             _this.$message({
               type: 'warning',
-              message: '未上传成功！请刷新界面重新上传！'
+              message: res.data.message
             })
           }
         })
         .catch(function (error) {
           console.log(error)
-          _this.$message({
-            type: 'warning',
-            message: '未上传成功！请重新上传！'
-          })
-        })
-    },
-    handleRemove (file, fileList) {
-      this.testlistform.FileUrl = ''
-      this.testlistform.FileName = ''
-      this.FileUrl = {}
-    },
-    handleUploadSuccess (res, file) {
-      this.testlistform.FileUrl = `${this.uploadFile.url}/${this.uploadFile.fid}`
-      this.testlistform.FileName = file.name
-      this.FileUrl = URL.createObjectURL(file.raw)
-    },
-    savedata () {
-      let _this = this
-      PersonnelApi.UpdatePersonnel(this.testlistform, {})
-        .then(res => {
-          // savedataedit(_this.testlistform.Id, _this.testlistform)
-          // _this.$axios.put('/personnel/saveeditinstument/' + _this.testlistform.Id, _this.testlistform)
-          // .then(res => {
-          // response
-          // if (res.info.code === 0) {
-          // if (_this.TimeNotification) {
-          //   // _this.getttriggernow(4802)
-          // }
-          // _this.$message({
-          //   type: 'success',
-          //   message: res.info.message
-          // })
-          // window.history.go(-1)
-          // } else {
-          // _this.$message({
-          //   type: 'warning',
-          //   message: res.info.message
-          // })
-          // }
-          this.dialogvisible = false
-          this.fileList = []
-          // 刷新
-          // this.$emit('initDatas')
-          this.$emit('closeEditDialog')
         })
-        .catch(err => {
-          // handle error
-          console.error(err)
-        })
-
     },
     getEntity (pid) {
       let _this = this
@@ -238,114 +188,16 @@ export default {
           console.error(err)
         })
     },
-    // // 查询action
-    // getttriggernow (id) {
-    //   gettriggerlist({}, id)
-    //     .then(res => {
-    //       let _this = this
-    //       _this.Advancetime = res.items.Advancetime
-    //       // 查询子表 有效期
-    //       _this.addTriggerl(_this.testlistform.Id, _this.testlistform.Code, _this.testlistform.TimeNotification, _this.testlistform.Name, _this.Advancetime, _this.testlistform.CalibrationTime, _this.testlistform.CalibrationDeadline, _this.testlistform.CalibrationDeadlineType)
-    //     })
-    //     .catch(err => {
-    //       console.error(err)
-    //     })
-    // },
-    // getclassificationlist () {
-    //   // 获取样本单位
-    //   let _this = this
-    //   let params = {
-    //     code: 'PersonnelItem'
-    //   }
-    //   classificationlist(params)
-    //     .then(res => {
-    //       _this.classificationlist = res.info
-    //     })
-    // },
-    // // 添加报警
-    // addTriggerl (ID, Code, TimeNotification, Name, Advancetime, CalibrationTime, CalibrationDeadline, CalibrationDeadlineType) {
-    //   // eslint-disable-next-line no-undef
-    //   let _this = this
-    //   _this.triggerlist.Aid = '4802'
-    //   _this.triggerlist.DId = ID
-    //   _this.triggerlist.Advancetime = Advancetime// action  报警提前时间
-    //   _this.triggerlist.TimeNotification = TimeNotification // 保质期到期提醒
-    //   _this.triggerlist.ProductDate = CalibrationTime// '校准日期',
-    //   _this.triggerlist.AccCode = Code // '物品编码',
-    //   _this.triggerlist.Name = Name // '姓名',
-    //   _this.triggerlist.ValidityLong = CalibrationDeadline // '有效时长',
-    //   _this.triggerlist.ValidityLongType = CalibrationDeadlineType// '有效时长类型：1天；2周；3月；4年',
-    //   _this.triggerlist.Category = 3 // '种类 1、耗材；2：试剂'
-    //   if (CalibrationDeadlineType === 1) {
-    //     _this.triggerlist.RemindTime = new Date(_this.addDate(CalibrationTime, CalibrationDeadline))
-    //   } else if (CalibrationDeadlineType === 2) {
-    //     _this.triggerlist.RemindTime = new Date(_this.addDate(CalibrationTime, CalibrationDeadline * 7))
-    //   } else if (CalibrationDeadlineType === 3) {
-    //     _this.triggerlist.RemindTime = new Date(_this.addDate(CalibrationTime, CalibrationDeadline * 30))
-    //   } else if (CalibrationDeadlineType === 4) {
-    //     _this.triggerlist.RemindTime = new Date(_this.addDate(CalibrationTime, CalibrationDeadline * 365))
-    //   }
-    //   addTrigger(_this.triggerlist)
-    //     .then(function (response) {
-
-    //     })
-    // },
-    // 计算日期
-    addDate (date, days) {
-      if (days === undefined || days === '') {
-        days = 1
-      }
-      var dates = new Date(date)
-      dates.setDate(dates.getDate() + days)
-      var month = dates.getMonth() + 1
-      var day = dates.getDate()
-      var mm = "'" + month + "'"
-      var dd = "'" + day + "'"
-
-      // 单位数前面加0
-      if (mm.length === 3) {
-        month = '0' + month
-      }
-      if (dd.length === 3) {
-        day = '0' + day
-      }
-
-      var time = dates.getFullYear() + '-' + month + '-' + day
-      return time
-    },
-    // // 获取供应商
-    // getSupplier () {
-    //   let _this = this
-    //   let params = {
-    //     customerName: 'Supplier'
-    //   }
-    //   getsupplierlist(params)
-    //     .then(res => {
-    //       _this.getsupplierlist = res.info
-    //     })
-    // },
     // 返回当前页
     handleCloseEdit () {
-      // this.$refs['uploader'].clearFiles()
       this.fileList = []
       this.$emit('closeEditDialog')
     },
     deletedataforDid (val) {
-      deletetriggerlistfordid(val)
-        .then(res => {
-        })
-        .catch(err => {
-          // handle error
-          console.error(err)
-        })
+
     }
 
   }
-  // watch: {
-  //   PersonnelId: function (newVal) {
-  //     this.getEntity(newVal)
-  //   }
-  // }
 
 }