productDev/parkBike.git

			@@ -3,6 +3,7 @@
			import com.doumee.api.BaseController;
			import com.doumee.core.annotation.excel.ExcelExporter;
			import com.doumee.core.annotation.pr.PreventRepeat;
			import com.doumee.core.constants.Constants;
			import com.doumee.core.model.ApiResponse;
			import com.doumee.core.model.PageData;
			import com.doumee.core.model.PageWrap;
			@@ -10,11 +11,13 @@
			import com.doumee.service.business.PricingDetailService;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.apache.commons.lang3.StringUtils;
			import org.apache.shiro.authz.annotation.RequiresPermissions;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;

			import javax.servlet.http.HttpServletResponse;
			import javax.validation.Valid;
			import java.util.ArrayList;
			import java.util.List;

			@@ -34,7 +37,7 @@
			@ApiOperation("新建")
			@PostMapping("/create")
			@RequiresPermissions("business:pricingdetail:create")
			public ApiResponse create(@RequestBody PricingDetail pricingDetail) {
			public ApiResponse create(@RequestBody @Valid PricingDetail pricingDetail) {
			return ApiResponse.success(pricingDetailService.create(pricingDetail));
			}

			@@ -63,7 +66,12 @@
			@PostMapping("/updateById")
			@RequiresPermissions("business:pricingdetail:update")
			public ApiResponse updateById(@RequestBody PricingDetail pricingDetail) {
			pricingDetailService.updateById(pricingDetail);
			if (StringUtils.isEmpty(pricingDetail.getId())){
			pricingDetailService.create(pricingDetail);
			}else {
			pricingDetailService.updateById(pricingDetail);
			}

			return ApiResponse.success(null);
			}

			@@ -87,4 +95,21 @@
			public ApiResponse findById(@PathVariable String id) {
			return ApiResponse.success(pricingDetailService.findById(id));
			}

			/**
			* 条件查询
			*
			* @param pricePramId 实体对象
			* @return List<PricingDetail>
			*/
			@ApiOperation("根据定价配置ID查询")
			@GetMapping("/findListByPricePramId")
			@RequiresPermissions("business:pricingdetail:query")
			public ApiResponse<List<PricingDetail>> findList(@RequestParam String pricePramId){
			PricingDetail pricingDetail = new PricingDetail();
			pricingDetail.setPricePramId(pricePramId);
			pricingDetail.setIsdeleted(Constants.ZERO);
			return ApiResponse.success(pricingDetailService.findList(pricingDetail));
			}

			}