|
|
@@ -828,6 +828,84 @@ func (this *SamplesSourceController) SaveBee() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+// @Title 更新动物基本信息
|
|
|
+// @Description 更新动物基本信息
|
|
|
+// @Param id path string true "需要修改的试管信息"
|
|
|
+// @Success 200 {object} controllers.Request
|
|
|
+// @router /editbee/:id [put]
|
|
|
+func (this *SamplesSourceController) EditBee() {
|
|
|
+ id := this.Ctx.Input.Param(":id")
|
|
|
+ var errinfo ErrorInfo
|
|
|
+ if id == "" {
|
|
|
+ errinfo.Message = "操作失败！请求信息不完整"
|
|
|
+ errinfo.Code = -2
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var model samplessource.AnimalInfo
|
|
|
+ var jsonblob = this.Ctx.Input.RequestBody
|
|
|
+ json.Unmarshal(jsonblob, &model)
|
|
|
+ var entity samplessource.AnimalInfo
|
|
|
+ model.ModifiedBy = this.User.Username
|
|
|
+ model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
|
+ svc := samplessource.GetSamplesSourceService(utils.DBE)
|
|
|
+ var cols []string = []string{"Genus", "InnerNo", "Name", "Amount", "Unit", "SourceType", "Weight", "Province", "ProvinceName", "City", "CityName", "Street", "StreetName", "Address", "AreaCode", "Longitude", "Latitude", "Altitude", "SurveyDate", "ProjectId", "ProjectName", "Remark", "ModifiedBy", "ModifiedUserId"}
|
|
|
+ zback := svc.QueryZBackList(this.User.AccCode)
|
|
|
+ for i := 0; i < (len(zback)); i++ {
|
|
|
+ cols = append(cols, zback[i].Id)
|
|
|
+ }
|
|
|
+ opdesc := "修改样本来源-" + model.Name
|
|
|
+ err := svc.UpdateDonorAndWriteLogBytbl(this.User.AccCode+AnimaltbName, this.User.AccCode+DonorslogtbName, id, &model, &entity, cols, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, model.Name)
|
|
|
+
|
|
|
+ if err == nil {
|
|
|
+ var codemodel codecsequence.CodecSequence
|
|
|
+ where_seq := "AccCode = '" + this.User.AccCode + "'"
|
|
|
+ where_seq += " and SeqName = '" + strconv.Itoa(model.Id) + "'"
|
|
|
+ svc.GetEntityByWhereBytbl(CodecSequenceName, where_seq, &codemodel)
|
|
|
+ codemodel.MaxValue = codemodel.MinValue + model.Amount - 1
|
|
|
+ codemodel.ModifiedBy = this.User.Username
|
|
|
+ codemodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
|
+ var code_cols []string = []string{"MaxValue", "ModifiedBy", "ModifiedUserId"}
|
|
|
+ svc.UpdateEntityBywheretbl(CodecSequenceName, &codemodel, code_cols, where_seq)
|
|
|
+
|
|
|
+ var sourceModel samplessource.AnimalInfo
|
|
|
+ sourceModel.InnerNo = model.AreaCode + "-" + fmt.Sprintf("%04s", strconv.Itoa(codemodel.MinValue)) + "——" + model.AreaCode + "-" + fmt.Sprintf("%04s", strconv.Itoa(codemodel.MaxValue))
|
|
|
+ where_innor := "Id = '" + strconv.Itoa(model.Id) + "'"
|
|
|
+ var cols_source []string = []string{"InnerNo"}
|
|
|
+ svc.UpdateEntityBywheretbl(this.User.AccCode+AnimaltbName, &sourceModel, cols_source, where_innor)
|
|
|
+ }
|
|
|
+
|
|
|
+ if err == nil {
|
|
|
+ var list []samplesinfo.SamplesMain
|
|
|
+ where_list := "SourceId = '" + strconv.Itoa(model.Id) + "'"
|
|
|
+ svc.GetEntitysByWhere(this.User.AccCode+SamplesMaintbName, where_list, &list)
|
|
|
+ if len(list) > 0 {
|
|
|
+ for i := 0; i < len(list); i++ {
|
|
|
+ var SamEntity samplesinfo.SamplesMain
|
|
|
+ where_sam := "MId = '" + strconv.Itoa(list[i].MId) + "'"
|
|
|
+ SamEntity.SourceName = model.Name
|
|
|
+ SamEntity.MCreateBy = this.User.Username
|
|
|
+ SamEntity.MCreateUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
|
+ var cols_sam []string = []string{"SourceName", "ModifiedBy", "ModifiedUserId"}
|
|
|
+ svc.UpdateEntityBywheretbl(this.User.AccCode+SamplesMaintbName, &SamEntity, cols_sam, where_sam)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if err == nil {
|
|
|
+ errinfo.Message = "操作成功！"
|
|
|
+ errinfo.Code = 0
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ } else {
|
|
|
+ errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
|
|
|
+ errinfo.Code = -1
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
+ this.ServeJSON()
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
// @Title 新增动物来源基本信息
|
|
|
// @Success 200 {object}
|
|
|
// @router /saveanimal [post]
|
|
|
@@ -949,9 +1027,9 @@ func (this *SamplesSourceController) DelBioInfo() {
|
|
|
}
|
|
|
var entity samplessource.AnimalInfo
|
|
|
var entityempty samplessource.AnimalInfo
|
|
|
- opdesc := "删除生物样本源-" + id
|
|
|
+ opdesc := "删除样本来源-" + entity.Name
|
|
|
svc := samplessource.GetSamplesSourceService(utils.DBE)
|
|
|
- err := svc.DeleteDonorAndWriteLogBytbl(this.User.AccCode+AnimaltbName, BaseOperationLogName, id, &entity, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "样本来源")
|
|
|
+ err := svc.DeleteDonorAndWriteLogBytbl(this.User.AccCode+AnimaltbName, this.User.AccCode+DonorslogtbName, id, &entity, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, entity.Name)
|
|
|
|
|
|
if err == nil {
|
|
|
where_code := "SeqName = '" + id + "'"
|
shihang