1

services/contract_service.go

@@ -35,6 +35,8 @@ type ContractService interface {
 	ValidRuleContractAdd(ctx iris.Context) (*viewmodels.Contracts, error)
 	ValidRuleContractEdi(ctx iris.Context) (*viewmodels.Contracts, error)
 	ValidRuleContractDel(ctx iris.Context) (*viewmodels.Contracts, error)
+	ValidRuleContractClose(ctx iris.Context) (*viewmodels.Contracts, error)
+
 	ValidRuleContractRetrunAdd(ctx iris.Context) (*viewmodels.ContractsReturn, error)
 	ValidRuleContractRetrun(ctx iris.Context) (*viewmodels.ContractsReturn, error)
 	ValidRuleContractRetrunDel(ctx iris.Context) (*viewmodels.ContractsReturn, error)
@@ -300,6 +302,26 @@ func (s *contractService) ValidRuleContractDel(ctx iris.Context) (*viewmodels.Co
 	return contractsVaild, nil
 }
 
+// 校验关闭合同参数
+func (s *contractService) ValidRuleContractClose(ctx iris.Context) (*viewmodels.Contracts, error) {
+	// 创建一个存放前端传过来参数
+	contractsVaild := &viewmodels.Contracts{}
+	// 存放raw的值，放入到contractsVaild
+	err := ctx.ReadJSON(contractsVaild)
+	if err != nil {
+		log.Println("folder-ValidRule-ReadForm转换异常, error=", err)
+		return contractsVaild, err
+	}
+	// 验证合同传参
+	err = contractsVaild.ValidateDel()
+	if err != nil {
+		log.Println("参数验证错误, error=", err)
+		return contractsVaild, err
+	}
+
+	return contractsVaild, nil
+}
+
 //------------------------------------------------------------
 // 获得项目节
 func (s *contractService) Get(treeId int, bidsectionId int, projectId int, treeType int) *viewmodels.TreeSectionContract {

web/api/contract_api.go

@@ -410,7 +410,7 @@ func (c *ContractApi) Delete() {
 // @Router /api/contract/close [post]
 func (c *ContractApi) PostClose() {
 	// 验证参数
-	contractData, err := c.ServiceContract.ValidRuleContractDel(c.Ctx)
+	contractData, err := c.ServiceContract.ValidRuleContractClose(c.Ctx)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
@@ -464,7 +464,7 @@ func (c *ContractApi) PostClose() {
 // @Router /api/contract/unlock [post]
 func (c *ContractApi) PostUnlock() {
 	// 验证参数
-	contractData, err := c.ServiceContract.ValidRuleContractDel(c.Ctx)
+	contractData, err := c.ServiceContract.ValidRuleContractClose(c.Ctx)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return