OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: custom indicator kpi_id issue

Browse Source
This commit is contained in:
simonzhangsz
2024-11-27 15:20:23 +08:00
parent de9e557b2f
commit baa04cc7f9
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
features/pm/kpi_c_title/controller.go
View File

@@ -36,7 +36,10 @@ func (k *KpiCTitle) GetToalList(c *gin.Context) {
if status := querys.Status; status != "" { if status := querys.Status; status != "" {
conditions = append(conditions, "status = ?") conditions = append(conditions, "status = ?")
params = append(params, status) params = append(params, status)
} else {
conditions = append(conditions, "status != 'Deleted'")
} }
whereSql := "" whereSql := ""
if len(conditions) > 0 { if len(conditions) > 0 {
whereSql += strings.Join(conditions, " and ") whereSql += strings.Join(conditions, " and ")
@@ -88,7 +91,10 @@ func (k *KpiCTitle) Get(c *gin.Context) {
if status := c.Query("status"); status != "" { if status := c.Query("status"); status != "" {
conditions = append(conditions, "status = ?") conditions = append(conditions, "status = ?")
params = append(params, status) params = append(params, status)
} else {
conditions = append(conditions, "status != 'Deleted'")
} }
whereSql := "" whereSql := ""
if len(conditions) > 0 { if len(conditions) > 0 {
whereSql += strings.Join(conditions, " and ") whereSql += strings.Join(conditions, " and ")
@@ -142,7 +148,10 @@ func (k *KpiCTitle) Total(c *gin.Context) {
if status := c.Query("status"); status != "" { if status := c.Query("status"); status != "" {
conditions = append(conditions, "status = ?") conditions = append(conditions, "status = ?")
params = append(params, status) params = append(params, status)
} else {
conditions = append(conditions, "status != 'Deleted'")
} }
whereSql := "" whereSql := ""
if len(conditions) > 0 { if len(conditions) > 0 {
whereSql += strings.Join(conditions, " and ") whereSql += strings.Join(conditions, " and ")
@@ -170,7 +179,11 @@ func (k *KpiCTitle) Post(c *gin.Context) {
c.JSON(http.StatusOK, services.ErrResp("custom indicator already exist")) c.JSON(http.StatusOK, services.ErrResp("custom indicator already exist"))
return return
} }
ret := dborm.DefaultDB().Table("kpi_c_title").Where("ne_type=? ORDER BY kpi_id DESC LIMIT 1", title.NeType).Scan(&res)
// Regexp match like AMF.C.01
kpiIDRegexp := "^" + *title.NeType + "\\.C\\.[0-9]{2}$"
ret := dborm.DefaultDB().Table("kpi_c_title").
Where("ne_type=? and kpi_id REGEXP ? ORDER BY kpi_id DESC LIMIT 1", title.NeType, kpiIDRegexp).Scan(&res)
if err := ret.Error; err != nil { if err := ret.Error; err != nil {
c.JSON(http.StatusOK, services.ErrResp(err.Error())) c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return return
@@ -243,8 +256,8 @@ func (k *KpiCTitle) Put(c *gin.Context) {
func (k *KpiCTitle) Delete(c *gin.Context) { func (k *KpiCTitle) Delete(c *gin.Context) {
id := c.Param("id") id := c.Param("id")
if err := dborm.DefaultDB().Delete(&KpiCTitle{}, id).Error; err != nil { if err := dborm.DefaultDB().Table(k.TableName()).Where("id=?", id).Update("status", "Deleted").Error; err != nil {
c.JSON(http.StatusOK, services.ErrResp("custom indicator not found")) c.JSON(http.StatusOK, services.ErrResp(err.Error()))
return return
} }