|
@@ -831,11 +831,24 @@ func (this *OilContractController) AddEntity() {
|
|
|
svc := contract.GetOilContractService(utils.DBE)
|
|
svc := contract.GetOilContractService(utils.DBE)
|
|
|
|
|
|
|
|
json.Unmarshal(jsonBlob, &model)
|
|
json.Unmarshal(jsonBlob, &model)
|
|
|
|
|
+
|
|
|
|
|
+ if model.IsYear == 1 && model.IsYearMoney == "" {
|
|
|
|
|
+ errinfo.Message = "跨年当年结算金额必填"
|
|
|
|
|
+ errinfo.Code = -2
|
|
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
|
|
+ this.ServeJSON()
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ if model.IsYearMoney == "" {
|
|
|
|
|
+ model.IsYearMoney = model.PerformAmount
|
|
|
|
|
+ }
|
|
|
|
|
+ model.ImportStatus = 2
|
|
|
model.CreateOn = time.Now()
|
|
model.CreateOn = time.Now()
|
|
|
model.CreateBy = this.User.Realname
|
|
model.CreateBy = this.User.Realname
|
|
|
model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
|
model.SecondUnit = this.User.UnitId
|
|
model.SecondUnit = this.User.UnitId
|
|
|
|
|
|
|
|
|
|
+ var model1 contract.OilContractMoney
|
|
|
var contract contract.OilContract
|
|
var contract contract.OilContract
|
|
|
tempCount, _ := svc.GetCount(&contract, "ContractNo='"+model.ContractNo+"' ")
|
|
tempCount, _ := svc.GetCount(&contract, "ContractNo='"+model.ContractNo+"' ")
|
|
|
if tempCount > 0 {
|
|
if tempCount > 0 {
|
|
@@ -849,6 +862,17 @@ func (this *OilContractController) AddEntity() {
|
|
|
_, err := svc.InsertEntityBytbl(OilContractName, &model)
|
|
_, err := svc.InsertEntityBytbl(OilContractName, &model)
|
|
|
|
|
|
|
|
if err == nil {
|
|
if err == nil {
|
|
|
|
|
+ if model.IsYear == 1 {
|
|
|
|
|
+ svc.GetEntityByWhere(OilContractName, "ContractNo = '" + model.ContractNo + "'", &model)
|
|
|
|
|
+ svc.GetEntityByWhere("OilContractMoney", "Year = '" + time.Now().Format("2006") + "' and ContractId = " + strconv.Itoa(model.Id), &model1)
|
|
|
|
|
+ model1.ContractId = model.Id
|
|
|
|
|
+ model1.Money = model.IsYearMoney
|
|
|
|
|
+ model1.Year = time.Now().Format("2006")
|
|
|
|
|
+ model1.CreateOn = time.Now()
|
|
|
|
|
+ model1.CreateBy = this.User.Realname
|
|
|
|
|
+ model1.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
|
|
|
+ svc.InsertEntityBytbl("OilContractMoney", &model1)
|
|
|
|
|
+ }
|
|
|
//新增
|
|
//新增
|
|
|
errinfo.Message = "添加成功!"
|
|
errinfo.Message = "添加成功!"
|
|
|
errinfo.Code = 0
|
|
errinfo.Code = 0
|
|
@@ -880,10 +904,20 @@ func (this *OilContractController) UpdateEntity() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
var model contract.OilContract
|
|
var model contract.OilContract
|
|
|
|
|
+ var model1 contract.OilContractMoney
|
|
|
svc := contract.GetOilContractService(utils.DBE)
|
|
svc := contract.GetOilContractService(utils.DBE)
|
|
|
|
|
|
|
|
var jsonBlob = this.Ctx.Input.RequestBody
|
|
var jsonBlob = this.Ctx.Input.RequestBody
|
|
|
json.Unmarshal(jsonBlob, &model)
|
|
json.Unmarshal(jsonBlob, &model)
|
|
|
|
|
+
|
|
|
|
|
+ if model.IsYear == 1 && model.IsYearMoney == "" {
|
|
|
|
|
+ errinfo.Message = "跨年当年结算金额必填"
|
|
|
|
|
+ errinfo.Code = -2
|
|
|
|
|
+ this.Data["json"] = &errinfo
|
|
|
|
|
+ this.ServeJSON()
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if model.IsYearMoney == "" {
|
|
if model.IsYearMoney == "" {
|
|
|
model.IsYearMoney = model.PerformAmount
|
|
model.IsYearMoney = model.PerformAmount
|
|
|
}
|
|
}
|
|
@@ -1030,6 +1064,24 @@ func (this *OilContractController) UpdateEntity() {
|
|
|
|
|
|
|
|
err := svc.UpdateEntityBytbl(OilContractName, id, &model, cols)
|
|
err := svc.UpdateEntityBytbl(OilContractName, id, &model, cols)
|
|
|
if err == nil {
|
|
if err == nil {
|
|
|
|
|
+ if model.IsYear == 1 && model.IsYearMoney != "" {
|
|
|
|
|
+ svc.GetEntityByWhere("OilContractMoney", "Year = '" + time.Now().Format("2006") + "' and ContractId = " + id, &model1)
|
|
|
|
|
+ if model1.Id > 0 {
|
|
|
|
|
+ model1.Money = model.IsYearMoney
|
|
|
|
|
+ model1.ModifiedOn = time.Now()
|
|
|
|
|
+ model1.ModifiedBy = this.User.Realname
|
|
|
|
|
+ model1.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
|
|
|
+ svc.UpdateEntityBytbl("OilContractMoney", model1.Id, &model1, []string{"Money"})
|
|
|
|
|
+ } else {
|
|
|
|
|
+ model1.ContractId,_ = strconv.Atoi(id)
|
|
|
|
|
+ model1.Money = model.IsYearMoney
|
|
|
|
|
+ model1.Year = time.Now().Format("2006")
|
|
|
|
|
+ model1.CreateOn = time.Now()
|
|
|
|
|
+ model1.CreateBy = this.User.Realname
|
|
|
|
|
+ model1.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
|
|
|
|
|
+ svc.InsertEntityBytbl("OilContractMoney", &model1)
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
errinfo.Message = "修改成功!"
|
|
errinfo.Message = "修改成功!"
|
|
|
errinfo.Code = 0
|
|
errinfo.Code = 0
|
|
|
this.Data["json"] = &errinfo
|
|
this.Data["json"] = &errinfo
|
|
@@ -1089,3 +1141,27 @@ func (this *OilContractController) DeleteEntity() {
|
|
|
this.ServeJSON()
|
|
this.ServeJSON()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+// @Title 获取合同结算金额总数
|
|
|
|
|
+// @Description
|
|
|
|
|
+// @Success 200 {object} ErrorInfo
|
|
|
|
|
+// @Failure 403 :id 为空
|
|
|
|
|
+// @router /countMoney/:Id [get]
|
|
|
|
|
+func (this *OilContractController) CountMoney() {
|
|
|
|
|
+ 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 contract.OilContractMoney
|
|
|
|
|
+ svc := contract.GetOilContractService(utils.DBE)
|
|
|
|
|
+ svc.GetSum(&model, "Year != '" + time.Now().Format("2006") + "'")
|
|
|
|
|
+ this.Data["json"] = &model
|
|
|
|
|
+ this.ServeJSON()
|
|
|
|
|
+}
|