2024-02-01 提成管理

controllers/Percentage.go

@@ -189,6 +189,7 @@ func (c *PercentageController) Percentage_Add() {
 		return
 	}
 	var_.T_item_price = Percentage.Generate_VerifyItem_Price(var_.T_item)
+	var_.T_item = "|" + var_.T_item
 
 	_, err = PercentageDao.Add_Percentage(var_)
 	if err != nil {
@@ -342,8 +343,8 @@ func (c *PercentageController) Percentage_Edit() {
 		percentage.T_type = T_type
 	}
 	if len(T_item) > 0 {
-		percentage.T_item = T_item
-		percentage.T_item_price = Percentage.Generate_VerifyItem_Price(percentage.T_item)
+		percentage.T_item = "|" + T_item
+		percentage.T_item_price = Percentage.Generate_VerifyItem_Price(T_item)
 	}
 
 	err = PercentageDao.Update_Percentage(percentage, "T_number", "T_uuid", "T_money", "T_type", "T_item", "T_item_price")
@@ -392,6 +393,33 @@ func (c *PercentageController) Percentage_Del() {
 	c.ServeJSON()
 	return
 }
+func (c *PercentageController) Percentage_Admin_Del() {
+
+	T_id, _ := c.GetInt("T_id")
+
+	o := orm.NewOrm()
+	PercentageDao := Percentage.NewPercentage(o)
+
+	percentage, err := PercentageDao.Read_Percentage_ById(T_id)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "查询失败！"}
+		c.ServeJSON()
+		return
+	}
+
+	err = PercentageDao.Delete_Percentage(percentage)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
+		c.ServeJSON()
+		return
+	}
+
+	NatsServer.AddUserLogs(c.User.T_uuid, "提成", "删除", T_id)
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: T_id}
+	c.ServeJSON()
+	return
+}
 
 // 打款
 func (c *PercentageController) Percentage_Remit() {

models/Contract/Contract.go

@@ -377,7 +377,7 @@ func (dao *ContractDaoImpl) Read_VerifyContract_List(T_name, T_customer_id strin
 	// 查询
 	var r []Contract
 	var err error
-	if page_z == 9999 {
+	if page_z == 9999 || len(T_customer_id) == 0 {
 		_, err = qs.SetCond((*orm2.Condition)(cond1)).OrderBy("-T_end_date").All(&r)
 	} else {
 		_, err = qs.Limit(page_z, offset).SetCond((*orm2.Condition)(cond1)).OrderBy("-T_end_date").All(&r)

models/Percentage/Percentage.go

@@ -304,7 +304,7 @@ func (dao *PercentageDaoImpl) Read_Percentage_List(T_name, T_uuid string, T_stat
 	if T_state > 0 {
 		cond1 = cond1.And("T_State", T_state)
 	} else {
-		cond1 = cond.AndNot("T_State", 6)
+		cond1 = cond1.AndNot("T_State", 6)
 	}
 
 	if len(T_name) > 0 {
@@ -427,7 +427,7 @@ func Get_Percentage_Count_ByVerifyItemId(verifyItemId int) (cnt int64, err error
 	cond := orm.NewCondition()
 	// 1-待审核 2-审核通过 3-审核不通过 4-部分打款 5-全部打款 6-未提交审核 审核状态
 	T_State := []int{1, 3, 6}
-	cond1 := cond.And("T_State__in", T_State).And("T_item_price__contains", fmt.Sprintf(`"%d":`, verifyItemId))
+	cond1 := cond.And("T_State__in", T_State).And("T_item__contains", fmt.Sprintf("|%d,", verifyItemId))
 
 	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
 	if err != nil {

routers/Percentage.go

@@ -14,11 +14,11 @@ func init() {
 		beego.NSRouter("/Add", &controllers.PercentageController{}, "*:Percentage_Add"),                   // 添加提成
 		beego.NSRouter("/Edit", &controllers.PercentageController{}, "*:Percentage_Edit"),                 // 编辑提成
 		beego.NSRouter("/Del", &controllers.PercentageController{}, "*:Percentage_Del"),                   // 删除提成
+		beego.NSRouter("/Admin_Del", &controllers.PercentageController{}, "*:Percentage_Admin_Del"),       // 管理员 删除提成
 		beego.NSRouter("/Approval", &controllers.PercentageController{}, "*:Percentage_Approval"),         // 提成审核
 		beego.NSRouter("/Remit", &controllers.PercentageController{}, "*:Percentage_Remit"),               // 打款明细
-		beego.NSRouter("/User/List", &controllers.PercentageController{}, "*:User_List"),                  // 提成审核
+		beego.NSRouter("/User/List", &controllers.PercentageController{}, "*:User_List"),                  // 提成管理-员工搜索
 		beego.NSRouter("/Submit_Audit", &controllers.PercentageController{}, "*:Percentage_Submit_Audit"), // 提交审核
 	)
-
 	beego.AddNamespace(percentage)
 }