forked from free-lancers/electricity_bill_calc_service
		
	feat(report):完成待摊薄费用条目的删除功能。
This commit is contained in:
		| @@ -30,6 +30,7 @@ func InitializeReportController(router *gin.Engine) { | ||||
| 	router.POST("/report/:rid/maintenance", security.EnterpriseAuthorize, createTemporaryWillDilutedFee) | ||||
| 	router.POST("/report/:rid/maintenance/import", security.EnterpriseAuthorize, importPredefinedMaintenanceFees) | ||||
| 	router.PUT("/report/:rid/maintenance/:mid", security.EnterpriseAuthorize, modifyWillDilutedFee) | ||||
| 	router.DELETE("/report/:rid/maintenance/:mid", security.EnterpriseAuthorize, deleteTemporaryWillDilutedFee) | ||||
| } | ||||
|  | ||||
| func ensureReportBelongs(c *gin.Context, result *response.Result, requestReportId string) bool { | ||||
| @@ -322,3 +323,18 @@ func modifyWillDilutedFee(c *gin.Context) { | ||||
| 	} | ||||
| 	result.Updated("指定待摊薄费用信息已经更新。") | ||||
| } | ||||
|  | ||||
| func deleteTemporaryWillDilutedFee(c *gin.Context) { | ||||
| 	result := response.NewResult(c) | ||||
| 	requestReportId := c.Param("rid") | ||||
| 	if !ensureReportBelongs(c, result, requestReportId) { | ||||
| 		return | ||||
| 	} | ||||
| 	requestFeeId := c.Param("mid") | ||||
| 	err := service.ReportService.DeleteWillDilutedFee(requestFeeId) | ||||
| 	if err != nil { | ||||
| 		result.Error(http.StatusInternalServerError, err.Error()) | ||||
| 		return | ||||
| 	} | ||||
| 	result.Deleted("指定待摊薄费用信息已经删除。") | ||||
| } | ||||
|   | ||||
| @@ -250,3 +250,8 @@ func (_ReportService) UpdateMaintenanceFee(feeId string, updates map[string]inte | ||||
| 	_, err = global.DBConn.Table(new(model.WillDilutedFee)).ID(feeId).Update(updates) | ||||
| 	return | ||||
| } | ||||
|  | ||||
| func (_ReportService) DeleteWillDilutedFee(fee string) (err error) { | ||||
| 	_, err = global.DBConn.ID(fee).NoAutoCondition().Delete(new(model.WillDilutedFee)) | ||||
| 	return | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user