年审信息

src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochange.go

@@ -180,20 +180,21 @@ type Del_OilInfoChange struct {
 }
 
 type OilInfoChangeItem struct {
-	Id             int       `xorm:"not null pk autoincr INT(10)"`
-	InfoId         int       `xorm:"comment('信息变更主表Id') INT(10)"`
-	SupplierId     int       `xorm:"comment('供方Id') INT(10)"`
-	SelectItem     string    `xorm:"comment('变更字段名') VARCHAR(50)"`
-	SelectItemName string    `xorm:"comment('变更字段名') VARCHAR(255)"`
-	BeChangeInfo   string    `xorm:"comment('变更前内容') VARCHAR(255)"`
-	ChangeInfo     string    `xorm:"comment('变更后内容') VARCHAR(255)"`
-	ChangeStatus   int       `xorm:"comment('变更状态') INT(10)"`
-	CreateOn       time.Time `xorm:"DATETIME"`
-	CreateUserId   int       `xorm:"INT(10)"`
-	CreateBy       string    `xorm:"VARCHAR(50)"`
-	ModifiedOn     time.Time `xorm:"DATETIME"`
-	ModifiedUserId int       `xorm:"INT(10)"`
-	ModifiedBy     string    `xorm:"VARCHAR(50)"`
+	Id               int       `xorm:"not null pk autoincr INT(10)"`
+	InfoId           int       `xorm:"comment('信息变更主表Id') INT(10)"`
+	SupplierTypeCode string    `xorm:"comment('1 年审 2 信息变更') VARCHAR(5)"`
+	SupplierId       int       `xorm:"comment('供方Id') INT(10)"`
+	SelectItem       string    `xorm:"comment('变更字段名') VARCHAR(50)"`
+	SelectItemName   string    `xorm:"comment('变更字段名') VARCHAR(255)"`
+	BeChangeInfo     string    `xorm:"comment('变更前内容') VARCHAR(255)"`
+	ChangeInfo       string    `xorm:"comment('变更后内容') VARCHAR(255)"`
+	ChangeStatus     int       `xorm:"comment('变更状态') INT(10)"`
+	CreateOn         time.Time `xorm:"DATETIME"`
+	CreateUserId     int       `xorm:"INT(10)"`
+	CreateBy         string    `xorm:"VARCHAR(50)"`
+	ModifiedOn       time.Time `xorm:"DATETIME"`
+	ModifiedUserId   int       `xorm:"INT(10)"`
+	ModifiedBy       string    `xorm:"VARCHAR(50)"`
 }
 
 type SuppModelInfo struct {

src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -13,6 +13,7 @@ import (
 	"dashoo.cn/business2/areajson"
 	"dashoo.cn/business2/items"
 	"dashoo.cn/business2/permission"
+	"reflect"
 
 	"encoding/json"
 	"fmt"
@@ -1028,8 +1029,12 @@ func (this *AnnualAuditController) AnnualAudit() {
 				msgService := msg2.GetMsgService(utils.DBE)
 				msgService.HandleMsg(toMobile,msg,"4-1",list.CreateBy,supplierEntity.ContactName,strconv.Itoa(list.CreateUserId))
 			} else {
-				status = suppliercert.ALL_PASE_STATUS
+				auditmodel.Status = suppliercert.ALL_PASE_STATUS
 			}
+			var infoitems []infochange.OilInfoChangeItem
+			where := "SupplierId = " + utils.ToStr(supplierEntity.Id) +" and InfoId = " +utils.ToStr(list.Id)
+			svc.GetEntities(&infoitems, where)
+			this.updatesupplier(OilSupplierName, supplierEntity.Id, infoitems)
 		}else {
 			auditmodel.ApplyTime = oldaplydate
 		}
@@ -1107,3 +1112,140 @@ func (this *AnnualAuditController) AnnualAudit() {
 		}
 	}
 }
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} supplier.OilSupplier
+// @router /getchangelist/:id [get]
+func (this *AnnualAuditController) GetChangeEntity() {
+	Id := this.Ctx.Input.Param(":id")
+	InfoId := this.GetString("InfomainId")
+	var models [2]supplier.OilSupplier
+	var model supplier.OilSupplier
+	var enumModel supplier.OilSupplier
+	svc := supplier.GetOilSupplierService(utils.DBE)
+	svc.GetEntityByIdBytbl(OilSupplierName, Id, &model)
+	models[0] = model
+
+	var infoitems []infochange.OilInfoChangeItem
+	where := " SupplierId = " + Id +" and InfoId ="+InfoId
+	where = where + " and ChangeStatus = 0"
+	svc.GetEntitysByWhere(OilInfoChangeItemName, where, &infoitems)
+	tmpModel := &model
+	enumModel = *tmpModel
+	immumodel := reflect.ValueOf(&enumModel)
+	elem := immumodel.Elem()
+	if len(infoitems) == 0 {
+		models[1] = enumModel
+		this.Data["json"] = &models
+		this.ServeJSON()
+		return
+	} else {
+		for _, info := range infoitems {
+			fmt.Println(info.SelectItem)
+			fmt.Println(";;;;;;;;;", elem.FieldByName(info.SelectItem).Type().String())
+			if elem.FieldByName(info.SelectItem).Type().String() == "int64" {
+				intchangeinfo, _ := strconv.ParseInt(info.ChangeInfo, 10, 64)
+				elem.FieldByName(info.SelectItem).SetInt(intchangeinfo)
+			} else if elem.FieldByName(info.SelectItem).Type().String() == "float64" {
+				floatchangeinfo, _ := strconv.ParseFloat(info.ChangeInfo, 64)
+				elem.FieldByName(info.SelectItem).SetFloat(floatchangeinfo)
+			} else if elem.FieldByName(info.SelectItem).Type().String() == "time.Time" {
+				t, _ := time.Parse("2006-01-02", info.ChangeInfo)
+				elem.FieldByName(info.SelectItem).Set(reflect.ValueOf(t))
+			} else {
+				elem.FieldByName(info.SelectItem).SetString(info.ChangeInfo)
+			}
+		}
+		models[1] = enumModel
+		this.Data["json"] = &models
+		this.ServeJSON()
+	}
+}
+
+// @Title 添加
+// @Description 新增
+// @Success	200	{object} controllers.Request
+// @router /addinfochangeitemch [post]
+func (this *AnnualAuditController) AddInfoChangeItemCh() {
+	var model InfoChangeItemsAll
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	json.Unmarshal(jsonBlob, &model)
+	var err error
+	where := " SupplierId = " + model.SupplierId
+	where = where + " and InfoId = " + model.MInfoId
+
+	var deleteEntity infochange.OilInfoChangeItem
+	delMainId, _ := strconv.Atoi(model.MInfoId)
+	deleteEntity.InfoId = delMainId
+	svc.DBE.Delete(deleteEntity)
+
+	var infoitementitys []infochange.OilInfoChangeItem
+	for i := 0; i < len(model.InfochangeForm); i++ {
+		var infoitementity infochange.OilInfoChangeItem
+		infoitementity.SelectItem = model.InfochangeForm[i].SelectItem
+		infoitementity.SelectItemName = model.InfochangeForm[i].SelectItemName
+		infoitementity.ChangeInfo = model.InfochangeForm[i].ChangeInfo
+		infoitementity.BeChangeInfo = model.InfochangeForm[i].BeChangeInfo
+		infoitementity.ChangeStatus = 0
+		infoitementity.SupplierTypeCode = "2"
+		infoitementity.SupplierId, _ = strconv.Atoi(model.SupplierId)
+		infoitementity.InfoId, _ = strconv.Atoi(model.MInfoId)
+		infoitementity.CreateOn = time.Now()
+		infoitementity.CreateBy = this.User.Realname
+		infoitementity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+		infoitementitys = append(infoitementitys, infoitementity)
+	}
+	_, err = svc.InsertEntityBytbl(""+OilInfoChangeItemName, &infoitementitys)
+
+	var errinfo ErrorDataInfo
+	if err == nil {
+		//新增
+		errinfo.Message = "添加成功！"
+		errinfo.Code = 0
+		//errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 获取变更项
+// @Description 获取实体
+// @Success 200 {object} annualaudit.OilAnnualAudit
+// @router /auditget/:id [get]
+func (this *AnnualAuditController) GetEntityThen() {
+	InfoId := this.Ctx.Input.Param(":id")
+	var model []infochange.OilInfoChangeItem
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	where := " InfoId = " + InfoId
+	svc.GetEntitysByWhere(OilInfoChangeItemName, where, &model)
+	var datainfo DataInfo
+	datainfo.Items = model
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+//更新供方信息表
+func (this *AnnualAuditController) updatesupplier(supname string, suppid int, infoitems []infochange.OilInfoChangeItem) error {
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	var err error
+	if len(infoitems) > 0 {
+		for i := 0; i < len(infoitems); i++ {
+			//var cols []string
+			//cols = append(cols, infoitems[i].SelectItem)
+			where := " Id = " + utils.ToStr(suppid)
+			var sql string
+			sql = `UPDATE ` + supname + ` set ` + infoitems[i].SelectItem + ` = '` + infoitems[i].ChangeInfo + `' where ` + where
+			_, err = svc.DBE.Exec(sql)
+			//err = svc.UpdateEntityBytbl(OilSupplierName, suppid, &supmodel, cols)
+		}
+	}
+
+	return err
+}

src/dashoo.cn/backend/api/controllers/oilsupplier/infochange.go

@@ -760,6 +760,7 @@ func (this *InfoChangeController) AddInfoChangeItemCh() {
 		infoitementity.ChangeInfo = model.InfochangeForm[i].ChangeInfo
 		infoitementity.BeChangeInfo = model.InfochangeForm[i].BeChangeInfo
 		infoitementity.ChangeStatus = 0
+		infoitementity.SupplierTypeCode = "2"
 		infoitementity.SupplierId, _ = strconv.Atoi(model.SupplierId)
 		infoitementity.InfoId, _ = strconv.Atoi(model.MInfoId)
 		infoitementity.CreateOn = time.Now()

src/dashoo.cn/frontend_web/src/api/oilsupplier/annualaudit.js

@@ -114,5 +114,25 @@ export default {
       data: formData,
       params: params
     })
+  },
+  GetChangeEntity (entityId, params, myAxios) {
+    return myAxios({
+      url: '/annualaudit/getchangelist/' + entityId,
+      method: 'GET',
+      params: params
+    })
+  },
+  addInfoChangeItemCh (formData, myAxios) {
+    return myAxios({
+      url: '/annualaudit/addinfochangeitemch',
+      method: 'post',
+      data: formData
+    })
+  },
+  getEntityThen (entityId, myAxios) {
+    return myAxios({
+      url: '/annualaudit/auditget/' + entityId,
+      method: 'GET'
+    })
   }
 }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -1139,15 +1139,7 @@
         commitshow: false,
         InfoData: [],
         AddChangeShow: false,
-        UnitRelationOptions: [],
-        UnitRelationAry: [],
-        countryoptions: [],
         selectuserlist: [],
-        countryprops: {
-          value: 'adcode',
-          label: 'name',
-          children: 'districts'
-        },
         infochangeItemList: [],
         infochangeForm: {
           SelectItem: '',
@@ -1600,13 +1592,13 @@
       },
       bfdataformat (val) {
         // debugger
-        if (val.SelectItem == 'SpecTypeCode') {
+        if (val.SelectItem === 'SpecTypeCode') {
           if (val.BeChangeInfo == '1') {
             return '一般外部'
-          } else if (val.BeChangeInfo == '2') {
+          } else if (val.BeChangeInfo === '2') {
             return '多元内部'
           }
-        } else if (val.SelectItem == 'InStyle') {
+        } else if (val.SelectItem === 'InStyle') {
           if (val.BeChangeInfo == '1') {
             return '评审准入'
           } else if (val.BeChangeInfo == '2') {
@@ -1618,7 +1610,7 @@
           } else if (val.BeChangeInfo == '5') {
             return '内部多元准入'
           }
-        } else if (val.SelectItem == 'CredentialFlag') {
+        } else if (val.SelectItem === 'CredentialFlag') {
           if (val.BeChangeInfo == '1') {
             return '三证合一'
           } else if (val.BeChangeInfo == '2') {
@@ -1626,7 +1618,7 @@
           } else if (val.BeChangeInfo == '3') {
             return '常规'
           }
-        } else if (val.SelectItem == 'SetupTime') {
+        } else if (val.SelectItem === 'SetupTime') {
           if (val.BeChangeInfo === '') {
             return '----'
           } else if (val.BeChangeInfo === '0001-01-01T08:00:00+08:00') {
@@ -1643,13 +1635,13 @@
       },
       dataformat (val) {
         // debugger
-        if (val.SelectItem == 'SpecTypeCode') {
+        if (val.SelectItem === 'SpecTypeCode') {
           if (val.ChangeInfo == '1') {
             return '一般外部'
           } else if (val.ChangeInfo == '2') {
             return '多元内部'
           }
-        } else if (val.SelectItem == 'InStyle') {
+        } else if (val.SelectItem === 'InStyle') {
           if (val.ChangeInfo == '1') {
             return '评审准入'
           } else if (val.ChangeInfo == '2') {
@@ -1661,7 +1653,7 @@
           } else if (val.ChangeInfo == '5') {
             return '内部多元准入'
           }
-        } else if (val.SelectItem == 'CredentialFlag') {
+        } else if (val.SelectItem === 'CredentialFlag') {
           if (val.ChangeInfo == '1') {
             return '三证合一'
           } else if (val.ChangeInfo == '2') {
@@ -1669,12 +1661,12 @@
           } else if (val.ChangeInfo == '3') {
             return '常规'
           }
-        } else if (val.SelectItem == 'SetupTime') {
+        } else if (val.SelectItem === 'SetupTime') {
           if (val.ChangeInfo == '') {
             return '----'
-          } else if (val.ChangeInfo == '0001-01-01T08:00:00+08:00') {
+          } else if (val.ChangeInfo === '0001-01-01T08:00:00+08:00') {
             return '----'
-          } else if (val.ChangeInfo == '5000-01-01T23:59:59+08:00') {
+          } else if (val.ChangeInfo === '5000-01-01T23:59:59+08:00') {
             return '永久'
           } else {
             let val2 = val.ChangeInfo.replace('T', ' ')