宿舍相关model

api/version1/dormitorymanagement/entrance.go

@@ -0,0 +1,3 @@
+package dormitorymanagement
+
+//宿舍管理

api/version1/personnelapi/mancont.go

@@ -1,7 +1,9 @@
 package personnelapi
 
 import (
+	"fmt"
 	"hr_server/models"
+	"hr_server/overall"
 	"hr_server/overall/overallhandle"
 	"time"
 
@@ -103,3 +105,249 @@ func (s *StaffApi) EditManOrgCont(c *gin.Context) {
 	}
 	overallhandle.Result(0, err, c)
 }
+
+/*
+*
+@ 作者: 秦东
+@ 时间: 2022-12-01 11:14:18
+@ 功能: 编辑人员主题信息
+@ 参数
+
+	#
+
+@ 返回值
+
+	#
+
+@ 方法原型
+
+	#
+*/
+func (s *StaffApi) EditManMainCont(c *gin.Context) {
+	var requestData EditContData
+	c.ShouldBindJSON(&requestData)
+	if requestData.Id == "" {
+		overallhandle.Result(1, requestData, c, "参数错误！请检查后重新提交！")
+		return
+	}
+	if requestData.Mobilephone == "" {
+		overallhandle.Result(1, requestData, c, "请输入电话号码！")
+		return
+	}
+	if requestData.Idcardno == "" {
+		overallhandle.Result(1, requestData, c, "请输入身份证号！")
+		return
+	}
+	var entryDateInt64 int64
+	if requestData.Entrydatetime == "" {
+		overallhandle.Result(1, requestData, c, "请输入入职日期！")
+		entryDateInt64 = 0
+		return
+	} else {
+		entryDateInt64, _ = overallhandle.DateToTimeStamp(fmt.Sprintf("%v 12:00:00", requestData.Entrydatetime))
+	}
+	fmt.Printf("requestData.Entrydatetime:%v<------------>entryDateInt64:%v\n", requestData.Entrydatetime, entryDateInt64)
+	if requestData.Probationperiod == 0 {
+		overallhandle.Result(1, requestData, c, "请输入试用期！")
+		return
+	}
+	if requestData.Gender == 0 {
+		requestData.Gender = 1
+	}
+	var birthdayInt64 int64 //生日
+	if requestData.Birthdaytime != "" {
+		birthdayInt64, _ = overallhandle.DateToTimeStamp(fmt.Sprintf("%v 12:00:00", requestData.Birthdaytime))
+	} else {
+		birthdayInt64 = 0
+	}
+	var planFormalDateInt64 int64 //转正日期
+	if requestData.Confirmationdate != "" {
+		planFormalDateInt64, _ = overallhandle.DateToTimeStamp(fmt.Sprintf("%v 12:00:00", requestData.Confirmationdate))
+	} else {
+		planFormalDateInt64 = 0
+	}
+	var idCardStartDateInt64 int64 //身份证有效期开始
+	if requestData.Idcardstarttimedata != "" {
+		idCardStartDateInt64, _ = overallhandle.DateToTimeStamp(fmt.Sprintf("%v 12:00:00", requestData.Idcardstarttimedata))
+	} else {
+		idCardStartDateInt64 = 0
+	}
+	var idCardEndDateInt64 int64 //身份证有效期结束
+	if requestData.Idcardendtimedata != "" {
+		idCardEndDateInt64, _ = overallhandle.DateToTimeStamp(fmt.Sprintf("%v 12:00:00", requestData.Idcardendtimedata))
+	} else {
+		idCardEndDateInt64 = 0
+	}
+	var jobStartDateInt64 int64 //参加工作日期
+	if requestData.Idcardendtimedata != "" {
+		jobStartDateInt64, _ = overallhandle.DateToTimeStamp(fmt.Sprintf("%v 12:00:00", requestData.Idcardendtimedata))
+	} else {
+		jobStartDateInt64 = 0
+	}
+	if requestData.Health == 0 {
+		requestData.Health = 1
+	}
+	if requestData.Maritalstatus == 0 {
+		requestData.Maritalstatus = 1
+	}
+	if requestData.Isveterans == 0 {
+		requestData.Isveterans = 2
+	}
+
+	wheAry := overallhandle.MapOut()
+	wheAry["`id`"] = requestData.Id
+	var myCont models.PersonArchives
+	err := myCont.GetCont(wheAry, "`key`", "`number`")
+	if err != nil {
+		overallhandle.Result(1, err, c, "该人员不存在！请核对后再提交！")
+		return
+	}
+	editTime := time.Now().Unix()
+	saveMainDate := overallhandle.MapOut()
+	if requestData.Wechat != "" && requestData.Wechat != myCont.Wechat {
+		saveMainDate["`wechat`"] = requestData.Wechat
+	} //绑定微信
+	if requestData.Workwechat != "" && requestData.Workwechat != myCont.WorkWechat {
+		saveMainDate["`work_wechat`"] = requestData.Workwechat
+	} //绑定企业微信
+	if requestData.Hireclass != 0 && requestData.Hireclass != myCont.HireClass {
+		saveMainDate["`hire_class`"] = requestData.Hireclass
+	} //雇佣类型
+	if requestData.Emptype != 0 && requestData.Emptype != myCont.EmpType {
+		saveMainDate["`emp_type`"] = requestData.Emptype
+	} //用工关系
+	if len(saveMainDate) > 0 {
+		saveMainDate["`eite_time`"] = editTime
+		myCont.EiteCont(wheAry, saveMainDate)
+	}
+	wheAryEs := overallhandle.MapOut()
+	wheAryEs["`key`"] = myCont.Key
+	var myInfo models.PersonnelContent
+	err = myInfo.GetCont(wheAryEs)
+	if err != nil {
+		myInfo.Number = myCont.Number                            //员工工号;index"`
+		myInfo.Idcardno = requestData.Idcardno                   //身份证号"`
+		myInfo.Passportno = requestData.Passportno               //护照号码"`
+		myInfo.Globalroaming = requestData.Globalroaming         //国际区号"`
+		myInfo.Mobilephone = requestData.Mobilephone             //手机号码"`
+		myInfo.Email = requestData.Email                         //电子邮件"`
+		myInfo.Gender = requestData.Gender                       //性别（1：男性；2：女性；3：中性）"`
+		myInfo.Birthday = birthdayInt64                          //"`
+		myInfo.Myfolk = requestData.Myfolk                       //民族"`
+		myInfo.Nativeplace = requestData.Nativeplace             //籍贯"`
+		myInfo.Idcardstartdate = idCardStartDateInt64            //身份证有效期开始"`
+		myInfo.Idcardenddate = idCardEndDateInt64                //身份证有效期结束"`
+		myInfo.Idcardaddress = requestData.Idcardaddress         //身份证地址"`
+		myInfo.IdcardIssued = requestData.IdcardIssued           //身份证签发机关"`
+		myInfo.Health = requestData.Health                       //健康状况（1：良好；2：一般；3：较弱，4：有生理缺陷；5：残废）"`
+		myInfo.Maritalstatus = requestData.Maritalstatus         //婚姻状况（1：未婚；2：已婚；3：丧偶；4：离异）"`
+		myInfo.Internaltelephone = requestData.Internaltelephone //内线电话"`
+		myInfo.Currentresidence = requestData.Currentresidence   //现居住地址"`
+		myInfo.Time = editTime                                   //创建时间"`
+		myInfo.Constellation = requestData.Constellationing      //星座（1：白羊座；2：金牛座；3：双子座；4：巨蟹座；5：狮子座；6：处女座；7：天枰座；8：天蝎座；9：射手座；10：摩羯座；11：水瓶座；12：双鱼座）"`
+
+		myInfo.Isveterans = requestData.Isveterans             //是否为退役军人（1：是；2：否）"`
+		myInfo.Veteransnumber = requestData.Veteransnumber     //退役证编号"`
+		myInfo.Jobstartdate = jobStartDateInt64                //参加工作日期"`
+		myInfo.Entrydate = entryDateInt64                      //入职日期"`
+		myInfo.Probationperiod = requestData.Probationperiod   //试用期"`
+		myInfo.Planformaldate = planFormalDateInt64            //预计转正日期"`
+		myInfo.PoliticalOutlook = requestData.Politicaloutlook //政治面貌(1：群众；2：无党派；3：台盟会员；4：九三社员；5：致公党员；6：农工党员；7：民进会员；8：民建会员；9：民盟盟员；10：民革会员，11：共青团员；12：预备党员；13：中共党员)"`
+		myInfo.Key = myCont.Key                                //"`
+		myInfo.NameUsedBefore = requestData.Nameusedbefore     //曾用名"`
+		err = overall.CONSTANT_DB_HR.Create(&myInfo).Error
+		if err != nil {
+			overallhandle.Result(106, err, c)
+			return
+		}
+	} else {
+		saveData := overallhandle.MapOut()
+		if requestData.Mobilephone != "" && requestData.Mobilephone != myInfo.Mobilephone {
+			saveData["`mobilephone`"] = requestData.Mobilephone
+		} //手机号码
+		if requestData.Idcardno != "" && requestData.Idcardno != myInfo.Idcardno {
+			saveData["`idcardno`"] = requestData.Mobilephone
+		} //身份证号
+		if entryDateInt64 != myInfo.Entrydate {
+			saveData["`entrydate`"] = entryDateInt64
+		} //入职日期
+		if requestData.Probationperiod != 0 && requestData.Probationperiod != myInfo.Probationperiod {
+			saveData["`probationperiod`"] = requestData.Probationperiod
+		} //试用期
+		if planFormalDateInt64 != myInfo.Planformaldate {
+			saveData["`planformaldate`"] = planFormalDateInt64
+		} // 预计转正日期
+		if jobStartDateInt64 != myInfo.Jobstartdate {
+			saveData["`jobstartdate`"] = jobStartDateInt64
+		} //参加工作日期
+		if requestData.Nameusedbefore != "" && requestData.Nameusedbefore != myInfo.NameUsedBefore {
+			saveData["`name_used_before`"] = requestData.Nameusedbefore
+		} //曾用名
+		if requestData.Gender != 0 && requestData.Gender != myInfo.Gender {
+			saveData["`gender`"] = requestData.Gender
+		} //性别
+		if requestData.Myfolk != "" && requestData.Myfolk != myInfo.Myfolk {
+			saveData["`myfolk`"] = requestData.Myfolk
+		} //民族
+		if requestData.Politicaloutlook != 0 && requestData.Politicaloutlook != myInfo.PoliticalOutlook {
+			saveData["`political_outlook`"] = requestData.Politicaloutlook
+		} //政治面貌
+		if requestData.Health != 0 && requestData.Health != myInfo.Health {
+			saveData["`health`"] = requestData.Health
+		} //健康状况
+		if birthdayInt64 != myInfo.Birthday {
+			saveData["`birthday`"] = birthdayInt64
+		} //生日
+		if idCardStartDateInt64 != myInfo.Idcardstartdate {
+			saveData["`idcardstartdate`"] = idCardStartDateInt64
+		} //身份证有效期开始
+		if idCardEndDateInt64 != myInfo.Idcardenddate {
+			saveData["`idcardenddate`"] = idCardEndDateInt64
+		} //身份证有效期结束
+		if requestData.Idcardaddress != "" && requestData.Idcardaddress != myInfo.Idcardaddress {
+			saveData["`idcardaddress`"] = requestData.Idcardaddress
+		} //身份证地址
+		if requestData.IdcardIssued != "" && requestData.IdcardIssued != myInfo.IdcardIssued {
+			saveData["`idcardIssued`"] = requestData.IdcardIssued
+		} //身份证签发机关
+		if requestData.Currentresidence != "" && requestData.Currentresidence != myInfo.Currentresidence {
+			saveData["`currentresidence`"] = requestData.Currentresidence
+		} //现居住地址
+		if requestData.Nativeplace != "" && requestData.Nativeplace != myInfo.Nativeplace {
+			saveData["`nativeplace`"] = requestData.Nativeplace
+		} //籍贯
+		if requestData.Email != "" && requestData.Email != myInfo.Email {
+			saveData["`email`"] = requestData.Email
+		} //电子邮件
+		if requestData.Internaltelephone != "" && requestData.Internaltelephone != myInfo.Internaltelephone {
+			saveData["`internaltelephone`"] = requestData.Internaltelephone
+		} //内线电话
+
+		if requestData.Isveterans != 0 && requestData.Isveterans != myInfo.Isveterans {
+			saveData["`isveterans`"] = requestData.Isveterans
+		} //是否为退役军人
+		if requestData.Veteransnumber != "" && requestData.Veteransnumber != myInfo.Veteransnumber {
+			saveData["`veteransnumber`"] = requestData.Veteransnumber
+		} //退役证编号
+		if requestData.Passportno != "" && requestData.Passportno != myInfo.Passportno {
+			saveData["`passportno`"] = requestData.Passportno
+		} //护照号码
+		if requestData.Globalroaming != "" && requestData.Globalroaming != myInfo.Globalroaming {
+			saveData["`globalroaming`"] = requestData.Globalroaming
+		} //国际区号
+
+		if requestData.Constellationing != 0 && requestData.Constellationing != myInfo.Constellation {
+			saveData["`constellationing`"] = requestData.Constellationing
+		} //星座
+		if len(saveData) > 0 {
+			saveData["`time`"] = editTime
+			err = myInfo.EiteCont(wheAryEs, saveData)
+			if err != nil {
+				overallhandle.Result(106, err, c)
+				return
+			}
+		}
+	}
+
+	overallhandle.Result(0, err, c)
+}

api/version1/personnelapi/staffarchives.go

@@ -994,13 +994,13 @@ func (s *StaffApi) EditEducationalExperience(c *gin.Context) {
 			case 2:
 				var editPerCont models.PersonnelEducation
 				editPerCont.EiteCont(map[string]interface{}{"`key`": enerCont.Key, "`level`": 2}, map[string]interface{}{"`level`": 1})
-				saveData["academic_degree"] = 2
+				saveData["level"] = 2
 			case 3:
 				var editPerCont models.PersonnelEducation
 				editPerCont.EiteCont(map[string]interface{}{"`key`": enerCont.Key, "`level`": 3}, map[string]interface{}{"`level`": 1})
-				saveData["academic_degree"] = 3
+				saveData["level"] = 3
 			default:
-				saveData["academic_degree"] = 1
+				saveData["level"] = 1
 			}
 
 		}
@@ -1534,7 +1534,7 @@ func (s *StaffApi) WorkHistoryList(c *gin.Context) {
 	}
 	var insideWorkHistoryList []models.WorkHistory
 	gormDb := overall.CONSTANT_DB_HR.Model(&models.WorkHistory{}).Where("`state` IN (1,2) AND `key` = ?", requestData.Id)
-	err := gormDb.Order("`entrytime` desc").Order("`id` desc").Find(&insideWorkHistoryList).Error
+	err := gormDb.Order("`entry_time` desc").Order("`id` desc").Find(&insideWorkHistoryList).Error
 	if err != nil {
 		overallhandle.Result(107, err, c)
 	} else {
@@ -1616,6 +1616,9 @@ func (s *StaffApi) FamilyMemBersList(c *gin.Context) {
 	var insideWorkHistoryList []models.FamilyMembers
 	gormDb := overall.CONSTANT_DB_HR.Model(&models.FamilyMembers{}).Where("`state` IN (1,2) AND `key` = ?", requestData.Id)
 	err := gormDb.Order("`id` desc").Find(&insideWorkHistoryList).Error
+	for i, v := range insideWorkHistoryList {
+		insideWorkHistoryList[i].PoliticalOutlookCn = overallhandle.PolitiToString(v.PoliticalOutlook)
+	}
 	if err != nil {
 		overallhandle.Result(107, err, c)
 	} else {

api/version1/personnelapi/types.go

@@ -184,3 +184,38 @@ type EditOrgPeople struct {
 	JobId    int64  `json:"jobid"`    //职务
 	JobLeve  int64  `json:"jobleve"`  //职务等级
 }
+
+//编辑人员主体信息
+type EditContData struct {
+	Id                  string `json:"id"`
+	Mobilephone         string `json:"mobilephone"`         //手机号码
+	Idcardno            string `json:"idcardno"`            //身份证号
+	Entrydatetime       string `json:"entrydatetime"`       //入职日期
+	Probationperiod     int    `json:"probationperiod"`     //试用期
+	Confirmationdate    string `json:"confirmationdate"`    // 预计转正日期
+	Jobstartdatestr     string `json:"jobstartdatestr"`     //参加工作日期
+	Nameusedbefore      string `json:"nameusedbefore"`      //曾用名
+	Gender              int    `json:"gender"`              //性别
+	Myfolk              string `json:"myfolk"`              //民族
+	Politicaloutlook    int    `json:"politicaloutlook"`    //政治面貌
+	Health              int    `json:"health"`              //健康状况
+	Birthdaytime        string `json:"birthdaytime"`        //生日
+	Idcardstarttimedata string `json:"idcardstarttimedata"` //身份证有效期开始
+	Idcardendtimedata   string `json:"idcardendtimedata"`   //身份证有效期结束
+	Idcardaddress       string `json:"idcardaddress"`       //身份证地址
+	IdcardIssued        string `json:"idcardIssued"`        //身份证签发机关
+	Currentresidence    string `json:"currentresidence"`    //现居住地址
+	Nativeplace         string `json:"nativeplace"`         //籍贯
+	Email               string `json:"email"`               //电子邮件
+	Internaltelephone   string `json:"internaltelephone"`   //内线电话
+	Hireclass           int    `json:"hireclass"`           //雇佣类型
+	Emptype             int    `json:"emptype"`             //用工关系
+	Isveterans          int    `json:"isveterans"`          //是否为退役军人
+	Veteransnumber      string `json:"veteransnumber"`      //退役证编号
+	Passportno          string `json:"passportno"`          //护照号码
+	Globalroaming       string `json:"globalroaming"`       //国际区号
+	Wechat              string `json:"wechat"`              //绑定微信
+	Workwechat          string `json:"workwechat"`          //绑定企业微信
+	Constellationing    int    `json:"constellationing"`    //星座
+	Maritalstatus       int    `json:"maritalstatus"`       //婚姻状况（1：未婚；2：已婚；3：丧偶；4：离异） int
+}

apirouter/personnel/people.go

@@ -62,7 +62,8 @@ func (p *PersonnelRoute) InitRouterGroup(route *gin.RouterGroup) {
 		apiRouter.POST("get_archives_cont", apiHandle.GetArchivesCon)              //获取人员基础信息（新版）
 		apiRouter.POST("get_people_main_cont", apiHandle.GetPeopleMainCont)        //获取员工主信息
 		apiRouter.POST("get_peo_data_integrity", apiHandle.GetPeopleDataIntegrity) //获取资料完整度
-		apiRouter.POST("edit_man_org_cont", apiHandle.EditManOrgCont)              //编辑人员行政组织
+		apiRouter.POST("edit_man_org_cont", apiHandle.EditManOrgCont)              //编辑人员行政组织  EditManMainCont
+		apiRouter.POST("edit_manmain_cont", apiHandle.EditManMainCont)             //编辑人员主题信息
 
 	}
 }

models/dormitoryes/building_unit.go

@@ -0,0 +1,61 @@
+package dormitoryes
+
+import (
+	"hr_server/overall"
+	"strings"
+)
+
+// 楼盘单元
+type BuildingUnit struct {
+	Id        int64  `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:Id;index"`
+	Name      string `json:"name" gorm:"column:name;type:varchar(255) ;comment:单元名称"`
+	State     int    `json:"state" gorm:"column:state;type:int(1) unsigned;default:1;not null;comment:状态（1：新入；2：调出；3：调入；4：退宿；5：限制管控；6：封禁；7；废弃；8：重新启用；9：拆除）"`
+	EditTime  int64  `json:"edittime" gorm:"column:edittime;type:bigint(20) unsigned;default:0;not null;comment:修改时间"`
+	Time      int64  `json:"time" gorm:"column:time;type:bigint(20) unsigned;default:0;not null;comment:写入时间"`
+	ProSaleId int64  `json:"prosaleid" gorm:"column:prosaleid;type:bigint(20) unsigned;default:0;not null;comment:宿舍楼盘"`
+}
+
+func (BuildingUnit *BuildingUnit) TableName() string {
+	return "building_unit"
+}
+
+// 编辑内容
+func (cont *BuildingUnit) EiteCont(whereMap interface{}, saveData interface{}) (err error) {
+	err = overall.CONSTANT_DB_HR.Model(&cont).Where(whereMap).Updates(saveData).Error
+	return
+}
+
+// 获取内容
+func (cont *BuildingUnit) GetCont(whereMap interface{}, field ...string) (err error) {
+	gormDb := overall.CONSTANT_DB_HR.Model(&cont)
+	if len(field) > 0 {
+		fieldStr := strings.Join(field, ",")
+		gormDb = gormDb.Select(fieldStr)
+	}
+	gormDb = gormDb.Where(whereMap)
+	err = gormDb.First(&cont).Error
+	return
+}
+
+// 根据条件获取总数
+func (cont *BuildingUnit) CountCont(whereMap interface{}) (countId int64) {
+	overall.CONSTANT_DB_HR.Model(&cont).Where(whereMap).Count(&countId)
+	return
+}
+
+// 读取全部信息
+func (cont *BuildingUnit) ContMap(whereMap interface{}, field ...string) (countAry []BuildingUnit, err error) {
+	gormDb := overall.CONSTANT_DB_HR.Model(&cont)
+	if len(field) > 0 {
+		fieldStr := strings.Join(field, ",")
+		gormDb = gormDb.Select(fieldStr)
+	}
+	err = gormDb.Where(whereMap).Find(&countAry).Error
+	return
+}
+
+// 删除内容
+func (cont *BuildingUnit) DelCont(whereMap interface{}) (err error) {
+	err = overall.CONSTANT_DB_HR.Where(whereMap).Delete(&cont).Error
+	return
+}

models/dormitoryes/dormitory.go

@@ -0,0 +1,63 @@
+package dormitoryes
+
+import (
+	"hr_server/overall"
+	"strings"
+)
+
+// 宿舍
+type Dormitory struct {
+	Id         int64  `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:Id;index"`
+	Name       string `json:"name" gorm:"column:name;type:varchar(255) ;comment:单元名称"`
+	TotalFloor int64  `json:"totalfloor" gorm:"column:totalfloor;type:int(5) unsigned;default:1;not null;comment:床位数量"`
+	SeatJson   string `json:"seatjson" gorm:"column:seatjson;type:longtext ;comment:床位json布局"`
+	UnitId     int64  `json:"unitid" gorm:"column:unitid;type:bigint(20) unsigned;default:0;not null;comment:归属单元"`
+	FloorId    int64  `json:"floorid" gorm:"column:floorid;type:int(3) unsigned;default:1;not null;comment:归属楼层"`
+	State      int    `json:"state" gorm:"column:state;type:int(2) unsigned;default:1;not null;comment:状态（1：新入；2：调出；3：调入；4：退宿；5：限制管控；6：封禁；7；废弃；8：重新启用；9：拆除）"`
+	Time       int64  `json:"time" gorm:"column:time;type:bigint(20) unsigned;default:0;not null;comment:写入时间"`
+}
+
+func (Dormitory *Dormitory) TableName() string {
+	return "dormitory"
+}
+
+// 编辑内容
+func (cont *Dormitory) EiteCont(whereMap interface{}, saveData interface{}) (err error) {
+	err = overall.CONSTANT_DB_HR.Model(&cont).Where(whereMap).Updates(saveData).Error
+	return
+}
+
+// 获取内容
+func (cont *Dormitory) GetCont(whereMap interface{}, field ...string) (err error) {
+	gormDb := overall.CONSTANT_DB_HR.Model(&cont)
+	if len(field) > 0 {
+		fieldStr := strings.Join(field, ",")
+		gormDb = gormDb.Select(fieldStr)
+	}
+	gormDb = gormDb.Where(whereMap)
+	err = gormDb.First(&cont).Error
+	return
+}
+
+// 根据条件获取总数
+func (cont *Dormitory) CountCont(whereMap interface{}) (countId int64) {
+	overall.CONSTANT_DB_HR.Model(&cont).Where(whereMap).Count(&countId)
+	return
+}
+
+// 读取全部信息
+func (cont *Dormitory) ContMap(whereMap interface{}, field ...string) (countAry []Dormitory, err error) {
+	gormDb := overall.CONSTANT_DB_HR.Model(&cont)
+	if len(field) > 0 {
+		fieldStr := strings.Join(field, ",")
+		gormDb = gormDb.Select(fieldStr)
+	}
+	err = gormDb.Where(whereMap).Find(&countAry).Error
+	return
+}
+
+// 删除内容
+func (cont *Dormitory) DelCont(whereMap interface{}) (err error) {
+	err = overall.CONSTANT_DB_HR.Where(whereMap).Delete(&cont).Error
+	return
+}

models/dormitoryes/properties_for_sale.go

@@ -0,0 +1,63 @@
+package dormitoryes
+
+import (
+	"hr_server/overall"
+	"strings"
+)
+
+// 宿舍楼盘
+type PropertiesForSale struct {
+	Id         int64  `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:Id;index"`
+	Name       string `json:"name" gorm:"column:name;type:varchar(255) ;comment:楼栋名称"`
+	State      int    `json:"state" gorm:"column:state;type:int(1) unsigned;default:1;not null;comment:状态（1：新入；2：调出；3：调入；4：退宿；5：限制管控；6：封禁；7；废弃；8：重新启用；9：拆除）"`
+	AddTime    int64  `json:"addtime" gorm:"column:addtime;type:bigint(20) unsigned;default:0;not null;comment:建立时间"`
+	EditTime   int64  `json:"edittime" gorm:"column:edittime;type:bigint(20) unsigned;default:0;not null;comment:修改时间"`
+	Time       int64  `json:"time" gorm:"column:time;type:bigint(20) unsigned;default:0;not null;comment:写入时间"`
+	Place      string `json:"place" gorm:"column:place;type:varchar(255) unsigned;default:'';not null;comment:位置"`
+	TotalFloor int64  `json:"totalfloor" gorm:"column:totalfloor;type:int(3) unsigned;default:1;not null;comment:楼层总量"`
+}
+
+func (PropertiesForSale *PropertiesForSale) TableName() string {
+	return "properties_for_sale"
+}
+
+// 编辑内容
+func (cont *PropertiesForSale) EiteCont(whereMap interface{}, saveData interface{}) (err error) {
+	err = overall.CONSTANT_DB_HR.Model(&cont).Where(whereMap).Updates(saveData).Error
+	return
+}
+
+// 获取内容
+func (cont *PropertiesForSale) GetCont(whereMap interface{}, field ...string) (err error) {
+	gormDb := overall.CONSTANT_DB_HR.Model(&cont)
+	if len(field) > 0 {
+		fieldStr := strings.Join(field, ",")
+		gormDb = gormDb.Select(fieldStr)
+	}
+	gormDb = gormDb.Where(whereMap)
+	err = gormDb.First(&cont).Error
+	return
+}
+
+// 根据条件获取总数
+func (cont *PropertiesForSale) CountCont(whereMap interface{}) (countId int64) {
+	overall.CONSTANT_DB_HR.Model(&cont).Where(whereMap).Count(&countId)
+	return
+}
+
+// 读取全部信息
+func (cont *PropertiesForSale) ContMap(whereMap interface{}, field ...string) (countAry []PropertiesForSale, err error) {
+	gormDb := overall.CONSTANT_DB_HR.Model(&cont)
+	if len(field) > 0 {
+		fieldStr := strings.Join(field, ",")
+		gormDb = gormDb.Select(fieldStr)
+	}
+	err = gormDb.Where(whereMap).Find(&countAry).Error
+	return
+}
+
+// 删除内容
+func (cont *PropertiesForSale) DelCont(whereMap interface{}) (err error) {
+	err = overall.CONSTANT_DB_HR.Where(whereMap).Delete(&cont).Error
+	return
+}

models/dormitoryes/seat.go

@@ -0,0 +1,61 @@
+package dormitoryes
+
+import (
+	"hr_server/overall"
+	"strings"
+)
+
+// 床位
+type Seat struct {
+	Id          int64  `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:Id;index"`
+	Name        string `json:"name" gorm:"column:name;type:varchar(255) ;comment:单元名称"`
+	State       int    `json:"state" gorm:"column:state;type:int(1) unsigned;default:1;not null;comment:状态（1：新入；2：调出；3：调入；4：退宿；5：限制管控；6：封禁；7；废弃；8：重新启用；9：拆除）"`
+	Time        int64  `json:"time" gorm:"column:time;type:bigint(20) unsigned;default:0;not null;comment:写入时间"`
+	DormiToryId int64  `json:"dormitoryid" gorm:"column:dormitoryid;type:bigint(20) unsigned;default:0;not null;comment:归属宿舍"`
+	UserKey     int64  `json:"userkey" gorm:"column:userkey;type:bigint(20) unsigned;default:0;not null;comment:使用人员Key"`
+}
+
+func (Seat *Seat) TableName() string {
+	return "seat"
+}
+
+// 编辑内容
+func (cont *Seat) EiteCont(whereMap interface{}, saveData interface{}) (err error) {
+	err = overall.CONSTANT_DB_HR.Model(&cont).Where(whereMap).Updates(saveData).Error
+	return
+}
+
+// 获取内容
+func (cont *Seat) GetCont(whereMap interface{}, field ...string) (err error) {
+	gormDb := overall.CONSTANT_DB_HR.Model(&cont)
+	if len(field) > 0 {
+		fieldStr := strings.Join(field, ",")
+		gormDb = gormDb.Select(fieldStr)
+	}
+	gormDb = gormDb.Where(whereMap)
+	err = gormDb.First(&cont).Error
+	return
+}
+
+// 根据条件获取总数
+func (cont *Seat) CountCont(whereMap interface{}) (countId int64) {
+	overall.CONSTANT_DB_HR.Model(&cont).Where(whereMap).Count(&countId)
+	return
+}
+
+// 读取全部信息
+func (cont *Seat) ContMap(whereMap interface{}, field ...string) (countAry []Seat, err error) {
+	gormDb := overall.CONSTANT_DB_HR.Model(&cont)
+	if len(field) > 0 {
+		fieldStr := strings.Join(field, ",")
+		gormDb = gormDb.Select(fieldStr)
+	}
+	err = gormDb.Where(whereMap).Find(&countAry).Error
+	return
+}
+
+// 删除内容
+func (cont *Seat) DelCont(whereMap interface{}) (err error) {
+	err = overall.CONSTANT_DB_HR.Where(whereMap).Delete(&cont).Error
+	return
+}