Merge branch '添加限制-1222'

# Conflicts:
#	backend/src/dashoo.cn/modi_webapi/app/api/duty/detail.go
#	backend/src/dashoo.cn/modi_webapi/app/service/duty/detail.go

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

@@ -1,9 +1,9 @@
 package class
 
 import (
+	"dashoo.cn/micro_libary/response"
 	"dashoo.cn/modi_webapi/app/service/class"
 	"dashoo.cn/modi_webapi/library/request"
-	"dashoo.cn/modi_webapi/library/response"
 	"fmt"
 	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/gtime"
@@ -12,21 +12,22 @@ import (
 
 type Controller struct {
 }
+
 //  获取班级管理列表
-func (c *Controller) GetAllClass(r *ghttp.Request){
+func (c *Controller) GetAllClass(r *ghttp.Request) {
 	page := request.GetPageInfo(r)
 	where := ""
 
 	if year := r.GetInt("Year"); year != 0 {
-		if where == ""{
+		if where == "" {
 			where = fmt.Sprintf(" Year = %v", year)
 		} else {
 			where += fmt.Sprintf(" AND Year = %v", year)
 		}
 	}
 
-	if name := r.GetString("Name"); name != ""{
-		if where == ""{
+	if name := r.GetString("Name"); name != "" {
+		if where == "" {
 			where = fmt.Sprintf(" Name LIKE '%%%v%%'", name)
 		} else {
 			where += fmt.Sprintf(" AND Name LIKE '%%%v%%'", name)
@@ -34,13 +35,13 @@ func (c *Controller) GetAllClass(r *ghttp.Request){
 	}
 
 	var result []class.Entity
-	if err := class.GetAllClass(page, where, &result); err != nil{
-		if err.Error() == "sql: no rows in result set"{
+	if err := class.GetAllClass(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 {
+	} else {
 		count, err1 := class.FindClassCount(where)
 		if err1 != nil {
 			response.Json(r, -1, err1.Error())
@@ -50,22 +51,22 @@ func (c *Controller) GetAllClass(r *ghttp.Request){
 			records.Current = page.Current
 			records.Total = count
 			records.Records = result
-			response.Json(r, 0, "", records)
+			response.Json(r, 0, "ok", records)
 		}
 	}
 }
 
 //  添加一条班级信息
-func (c *Controller) AddClass(r *ghttp.Request){
+func (c *Controller) AddClass(r *ghttp.Request) {
 	Class := new(class.Entity)
 	if err := r.Parse(Class); err != nil {
 		// 数据验证错误
 		if v, ok := err.(*gvalid.Error); ok {
-			response.Json(r, 1, v.FirstString())
+			response.Json(r, -1, v.FirstString())
 			r.ExitAll()
 		}
 		// 其他错误
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 		r.ExitAll()
 	}
 	realName := r.GetParamVar("realname").String()
@@ -75,41 +76,49 @@ func (c *Controller) AddClass(r *ghttp.Request){
 	Class.UpdatedTime = currentTime
 	Class.UpdatedBy = realName
 
-	if result,err := class.Insert(Class); err != nil {
-		response.Json(r, 1, err.Error())
+	if result, err := class.Insert(Class); err != nil {
+		response.Json(r, -1, err.Error())
 	} else {
 		var records response.PagedRecords
 		id, _ := result.LastInsertId()
 		Class.Id = int(id)
 		records.Records = Class
-		response.Json(r, 0, "", records)
+		response.Json(r, 0, "ok", records)
 	}
 }
+
 //  获取一条班级信息
-func (c *Controller) GetOneClass(r *ghttp.Request){
+func (c *Controller) GetOneClass(r *ghttp.Request) {
 	id := r.GetInt("id")
+	if id == 0 {
+		response.Json(r, -1, "id不能为空")
+	}
 	if result, err := class.FindOne(id); err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 		r.ExitAll()
-	}else {
+	} else {
 		var records response.PagedRecords
 		records.Records = result
-		response.Json(r, 0, "", records)
+		response.Json(r, 0, "ok", records)
 	}
 
 }
 
 // 修改一条班级信息
-func (c *Controller) UpdateClass(r *ghttp.Request){
+func (c *Controller) UpdateClass(r *ghttp.Request) {
 	Class := new(class.Entity)
+	if Class.Id == 0 {
+		response.Json(r, -1, "Id不能为空")
+	}
+
 	if err := r.Parse(Class); err != nil {
 		// 数据验证错误
 		if v, ok := err.(*gvalid.Error); ok {
-			response.Json(r, 1, v.FirstString())
+			response.Json(r, -1, v.FirstString())
 			r.ExitAll()
 		}
 		// 其他错误
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 		r.ExitAll()
 	}
 
@@ -119,21 +128,25 @@ func (c *Controller) UpdateClass(r *ghttp.Request){
 	Class.UpdatedTime = currentTime
 	Class.UpdatedBy = realName
 
-	if _,err := class.Replace(Class); err != nil {
-		response.Json(r, 1, err.Error())
+	if _, err := class.Replace(Class); err != nil {
+		response.Json(r, -1, err.Error())
 	} else {
 		var records response.PagedRecords
 		records.Records = Class
-		response.Json(r, 0, "", records)
+		response.Json(r, 0, "ok", records)
 	}
 }
- //   删除一条班级信息
-func (c *Controller) DeleteClass(r *ghttp.Request){
+
+//   删除一条班级信息
+func (c *Controller) DeleteClass(r *ghttp.Request) {
 	id := r.GetInt("id")
-	if _,err := class.Delete(fmt.Sprintf("Id=%v", id)); err != nil{
-		response.Json(r, 1, err.Error())
+	if id == 0 {
+		response.Json(r, -1, "id不能为空")
+	}
+	if _, err := class.Delete(fmt.Sprintf("Id=%v", id)); err != nil {
+		response.Json(r, -1, err.Error())
 		r.ExitAll()
 	} else {
-		response.Json(r, 0, "该记录已删除！")
+		response.Json(r, 0, "记录已删除！")
 	}
 }

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

@@ -1,6 +1,7 @@
 package duty
 
 import (
+	"dashoo.cn/micro_libary/response"
 	"dashoo.cn/modi_webapi/app/common"
 	"dashoo.cn/modi_webapi/app/model/duty/detail"
 	detailService "dashoo.cn/modi_webapi/app/service/duty"
@@ -156,6 +157,23 @@ func (c *DetailController) DeleteDetail(r *ghttp.Request) {
 
 }
 
+// 根据父级id查询
+func (c *DetailController) GetDetailByDutyId(r *ghttp.Request) {
+	// tenant 租户模式
+	tenant := r.Header.Get("Tenant")
+	// 初始化service
+	service, err := detailService.NewDetailService(tenant)
+	if err != nil {
+		response.Json(r, -1, err.Error())
+	}
+	DutyId := r.GetInt("DutyId")
+	if result, err := service.GetDetailByDutyId(DutyId); err != nil {
+		response.Json(r, 1, err.Error())
+	} else {
+		response.Json(r, 0, "ok", result)
+	}
+}
+
 // 批量添加
 func (c *DetailController) BatchAdd(r *ghttp.Request) {
 	// tenant 租户模式

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

@@ -25,20 +25,20 @@ func (c *Controller) Save(r *ghttp.Request) {
 	// 初始化学生service
 	servcie, err := service.NewInformationService(tenant)
 	if err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 	}
 
 	// 判断是新增还是删除，获取的id为空新增，不为空则更新
 	if addOrUpdateReq.Id > 0 {
 		if newStudent, err := servcie.Update(addOrUpdateReq); err != nil {
-			response.Json(r, 1, err.Error())
+			response.Json(r, -1, err.Error())
 		} else {
 			response.Json(r, 0, "更新成功", newStudent)
 		}
 	} else {
 		addOrUpdateReq.Id = 0
 		if newId, err := servcie.Add(addOrUpdateReq); err != nil {
-			response.Json(r, 1, err.Error())
+			response.Json(r, -1, err.Error())
 		} else {
 			response.Json(r, 0, "新建成功", newId)
 		}
@@ -52,15 +52,18 @@ func (c *Controller) DeleteById(r *ghttp.Request) {
 	tenant := r.Header.Get("Tenant")
 	id := r.GetInt("id")
 	glog.Info(id)
+	if id == 0 {
+		response.Json(r, -1, "id不能为空")
+	}
 
 	// 初始化学生service
 	servcie, err := service.NewInformationService(tenant)
 	if err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 	}
 
 	if err := servcie.Delete(id); err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 	} else {
 		response.Json(r, 0, "删除成功")
 	}
@@ -73,14 +76,17 @@ func (c *Controller) GetDetailById(r *ghttp.Request) {
 	// 学生id
 	id := r.GetInt("id")
 	glog.Info(id)
+	if id == 0 {
+		response.Json(r, -1, "id不能为空")
+	}
 	// 初始化学生service
 	servcie, err := service.NewInformationService(tenant)
 	if err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 	}
 	// 调用service方法
 	if information, err := servcie.GetByID(id); err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 	} else {
 		response.Json(r, 0, "ok", information)
 	}
@@ -94,7 +100,7 @@ func (c *Controller) GetPageList(r *ghttp.Request) {
 	// 初始化学生service
 	servcie, err := service.NewInformationService(tenant)
 	if err != nil {
-		response.Json(r, 1, err.Error())
+		response.Json(r, -1, err.Error())
 	}
 	// 分页查询信息列表
 	var selectPageReq information.SelectPageReq

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

@@ -1,9 +1,9 @@
 package instrument
 
 import (
+	"dashoo.cn/micro_libary/response"
 	"dashoo.cn/modi_webapi/app/service/instrument"
 	"dashoo.cn/modi_webapi/library/request"
-	"dashoo.cn/modi_webapi/library/response"
 	"fmt"
 	"github.com/gogf/gf/net/ghttp"
 	"github.com/gogf/gf/os/gtime"
@@ -13,34 +13,34 @@ import (
 type Controller struct {
 }
 
-func (c *Controller) GetAllInstrument(r *ghttp.Request){
+func (c *Controller) GetAllInstrument(r *ghttp.Request) {
 	page := request.GetPageInfo(r)
 	where := ""
 
-	if productway := r.GetString("ProductWay"); productway != ""{
-		if where == ""{
+	if productway := r.GetString("ProductWay"); productway != "" {
+		if where == "" {
 			where = fmt.Sprintf(" ProductWay = %v", productway)
 		} else {
 			where += fmt.Sprintf(" AND ProductWay = %v", productway)
 		}
 	}
 
-	if name := r.GetString("ProductName"); name != ""{
-		if where == ""{
-			where = fmt.Sprintf(" ProductName LIKE '%%%v%%'", name)
+	if name := r.GetString("Name"); name != "" {
+		if where == "" {
+			where = fmt.Sprintf(" Name LIKE '%%%v%%'", name)
 		} else {
-			where += fmt.Sprintf(" AND ProductName LIKE '%%%v%%'", name)
+			where += fmt.Sprintf(" AND Name LIKE '%%%v%%'", name)
 		}
 	}
 
 	var result []instrument.Entity
-	if err := instrument.GetAllInstrument(page, where, &result); err != nil{
-		if err.Error() == "sql: no rows in result set"{
+	if err := instrument.GetAllInstrument(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 {
+	} else {
 		count, err1 := instrument.FindInstrumentCount(where)
 		if err1 != nil {
 			response.Json(r, -1, err1.Error())
@@ -50,18 +50,17 @@ func (c *Controller) GetAllInstrument(r *ghttp.Request){
 			records.Current = page.Current
 			records.Total = count
 			records.Records = result
-			response.Json(r, 0, "", records)
+			response.Json(r, 0, "ok", records)
 		}
 	}
 }
 
-
-func (c *Controller) GetOneInstrument(r *ghttp.Request){
+func (c *Controller) GetOneInstrument(r *ghttp.Request) {
 	id := r.GetInt("id")
 	if result, err := instrument.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)
@@ -69,9 +68,9 @@ func (c *Controller) GetOneInstrument(r *ghttp.Request){
 
 }
 
-func (c *Controller) AddInstrument(r *ghttp.Request){
+func (c *Controller) AddInstrument(r *ghttp.Request) {
 	Instrument := new(instrument.Entity)
-	fmt.Println("---Instrument---",Instrument)
+	fmt.Println("---Instrument---", Instrument)
 	if err := r.Parse(Instrument); err != nil {
 		// 数据验证错误
 		if v, ok := err.(*gvalid.Error); ok {
@@ -95,7 +94,7 @@ func (c *Controller) AddInstrument(r *ghttp.Request){
 	Instrument.ModifiedBy = realName
 	Instrument.ModifiedUserId = userId
 
-	if result,err := instrument.Insert(Instrument); err != nil {
+	if result, err := instrument.Insert(Instrument); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
 		var records response.PagedRecords
@@ -106,7 +105,7 @@ func (c *Controller) AddInstrument(r *ghttp.Request){
 	}
 }
 
-func (c *Controller) UpdateInstrument(r *ghttp.Request){
+func (c *Controller) UpdateInstrument(r *ghttp.Request) {
 	Instrument := new(instrument.Entity)
 	if err := r.Parse(Instrument); err != nil {
 		// 数据验证错误
@@ -127,7 +126,7 @@ func (c *Controller) UpdateInstrument(r *ghttp.Request){
 	Instrument.ModifiedBy = realName
 	Instrument.ModifiedUserId = userId
 
-	if _,err := instrument.Replace(Instrument); err != nil {
+	if _, err := instrument.Replace(Instrument); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
 		var records response.PagedRecords
@@ -138,9 +137,9 @@ func (c *Controller) UpdateInstrument(r *ghttp.Request){
 	}
 }
 
-func (c *Controller) DeleteInstrument(r *ghttp.Request){
+func (c *Controller) DeleteInstrument(r *ghttp.Request) {
 	id := r.GetInt("id")
-	if _,err := instrument.Delete(fmt.Sprintf("Id=%v", id)); err != nil{
+	if _, err := instrument.Delete(fmt.Sprintf("Id=%v", id)); err != nil {
 		response.Json(r, 1, err.Error())
 		r.ExitAll()
 	} else {

backend/src/dashoo.cn/modi_webapi/app/api/system/item/item.go

@@ -28,6 +28,9 @@ func (c *ItemController) GetDetailById(r *ghttp.Request) {
 	// 字典分类id
 	itemId := r.GetInt64("id")
 	glog.Info(itemId)
+	if itemId == 0 {
+		response.Json(r, -1, "id不能为空")
+	}
 	rsp, err := ItemService.GetEntityById(context.TODO(), &protoItem.IdReq{
 		Tenant: tenant,
 		Id:     itemId,
@@ -38,7 +41,7 @@ func (c *ItemController) GetDetailById(r *ghttp.Request) {
 	} else {
 		commonmsg := rsp.CommonMsg
 		if commonmsg.Code == 0 {
-			response.Json(r, 0, "", rsp.Entity)
+			response.Json(r, 0, "ok", rsp.Entity)
 		} else {
 			response.Json(r, -1, commonmsg.Msg)
 		}
@@ -80,6 +83,9 @@ func (c *ItemController) UpdateItem(r *ghttp.Request) {
 	if err := r.Parse(&UpdateReq); err != nil {
 		response.Json(r, -1, err.Error())
 	}
+	if UpdateReq.Id == 0 {
+		response.Json(r, -1, "Id不能为空")
+	}
 	glog.Info(UpdateReq)
 	// 调用服务层保存字典分类接口
 	rsp, err := ItemService.UpdateById(context.TODO(), &protoItem.UpdateReq{

backend/src/dashoo.cn/modi_webapi/app/api/system/itemdetail/itemdetail.go

@@ -28,6 +28,9 @@ func (c *ItemDetailController) GetDetailById(r *ghttp.Request) {
 	// 字典id
 	ItemDetailId := r.GetInt64("id")
 	glog.Info(ItemDetailId)
+	if ItemDetailId == 0 {
+		response.Json(r, -1, "id不能为空")
+	}
 	rsp, err := ItemDetailService.GetEntityById(context.TODO(), &protoItemDetail.IdReq{
 		Tenant: tenant,
 		Id:     ItemDetailId,
@@ -38,7 +41,7 @@ func (c *ItemDetailController) GetDetailById(r *ghttp.Request) {
 	} else {
 		commonmsg := rsp.CommonMsg
 		if commonmsg.Code == 0 {
-			response.Json(r, 0, "", rsp.Entity)
+			response.Json(r, 0, "ok", rsp.Entity)
 		} else {
 			response.Json(r, -1, commonmsg.Msg)
 		}
@@ -81,6 +84,10 @@ func (c *ItemDetailController) UpdateItemDetail(r *ghttp.Request) {
 		response.Json(r, -1, err.Error())
 	}
 	glog.Info(UpdateReq)
+	if UpdateReq.Id == 0 {
+		response.Json(r, -1, "Id不能为空")
+	}
+
 	// 调用服务层保存字典接口
 	rsp, err := ItemDetailService.UpdateById(context.TODO(), &protoItemDetail.UpdateReq{
 		Tenant: tenant,
@@ -159,7 +166,7 @@ func (c *ItemDetailController) GetPageList(r *ghttp.Request) {
 		records.Size = page.Size
 		records.Total = int(rsp.RecordCount)
 		records.Records = rsp.List
-		response.Json(r, 0, "", records)
+		response.Json(r, 0, "ok", records)
 	}
 
 }

backend/src/dashoo.cn/modi_webapi/app/api/system/menu/menu.go

@@ -34,7 +34,7 @@ func (c *Controller) GetList(r *ghttp.Request) {
 	} else {
 		var records response.PagedRecords
 		records.Records = rsp.List
-		response.Json(r, 0, "", records)
+		response.Json(r, 0, "ok", records)
 	}
 }
 
@@ -67,7 +67,7 @@ func (c *Controller) Add(r *ghttp.Request) {
 	if err != nil {
 		response.Json(r, -1, err.Error())
 	} else {
-		response.Json(r, 0, "", rsp.Data)
+		response.Json(r, 0, "ok", rsp.Data)
 	}
 }
 
@@ -142,6 +142,6 @@ func (c *Controller) GetMenuTree(r *ghttp.Request) {
 	if err != nil {
 		response.Json(r, -1, err.Error())
 	} else {
-		response.Json(r, 0, "", rsp.List)
+		response.Json(r, 0, "ok", rsp.List)
 	}
 }

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

@@ -97,3 +97,15 @@ func (s DetailService) Adds(param []string) (id int64, err error) {
 	}
 	return id, nil
 }
+
+// 根据父级ID查询
+func (s DetailService) GetDetailByDutyId(dutyId int) (list []*detail.Entity, err error) {
+	model := s.SafeModel.Where("DutyId", dutyId).Where("isDel", 0)
+	var result []*detail.Entity
+	err = model.Structs(&result)
+	// 如果未查到列表返回空
+	if err == sql.ErrNoRows {
+		return nil, nil
+	}
+	return result, err
+}

frontend_web/src/api/class.js

@@ -1,25 +1,25 @@
 import request from '@/plugin/axios'
 
 export default {
-   // 获取班级列表
-   getAllClass(params) {
+  // 获取班级列表
+  getAllClass (params) {
     return request({
       url: process.env.VUE_APP_API + 'class/getallclass',
-      method: 'get', 
+      method: 'get',
       params: params
     })
   },
 
   // 删除班级信息
-   deleteClass(params) {
+  deleteClass (params) {
     return request({
       url: process.env.VUE_APP_API + 'class/deleteclass',
       method: 'delete',
       params: params
     })
   },
-  
-   // 保存班级信息
+
+  // 保存班级信息
   addClass (data) {
     return request({
       url: process.env.VUE_APP_API + 'class/addclass',
@@ -36,12 +36,12 @@ export default {
     })
   },
   // 获取一条班级信息
-  getOneClass(params) {
+  getOneClass (params) {
     return request({
       url: process.env.VUE_APP_API + 'class/getoneclass',
-      method: 'get', 
+      method: 'get',
       params: params
     })
-  },
-  
-}
+  }
+
+}

frontend_web/src/api/information.js

@@ -1,39 +1,39 @@
 import request from '@/plugin/axios'
 
 export default {
-   // 产品方案 ----获取产品信息列表
-  getList(params) {
+  // 产品方案 ----获取产品信息列表
+  getList (params) {
     return request({
       url: process.env.VUE_APP_API + 'information/getpagelist',
-      method: 'get', 
+      method: 'get',
       params: params
     })
   },
 
-  getById(params) {
+  getById (params) {
     return request({
       url: process.env.VUE_APP_API + 'information/getdetailbyid',
-      method: 'get', 
+      method: 'get',
       params: params
     })
   },
 
-  //删除产品信息
-   delete(params) {
+  // 删除产品信息
+  delete (params) {
     return request({
       url: process.env.VUE_APP_API + 'information/deletebyid',
       method: 'delete',
       params: params
     })
   },
-  
-   // 保存产品方案
-  save(data) {
+
+  // 保存产品方案
+  save (data) {
     return request({
       url: process.env.VUE_APP_API + 'information/save',
       method: 'post',
       data: data
     })
   }
-  
-}
+
+}