diff --git a/src/main/java/com/xujie/modules/part/controller/PartController.java b/src/main/java/com/xujie/modules/part/controller/PartController.java index 772e0e2..796e88e 100644 --- a/src/main/java/com/xujie/modules/part/controller/PartController.java +++ b/src/main/java/com/xujie/modules/part/controller/PartController.java @@ -1,8 +1,10 @@ package com.xujie.modules.part.controller; import com.xujie.common.utils.PageUtils; import com.xujie.common.utils.R; +import com.xujie.modules.oss.entity.SysOssEntity; import com.xujie.modules.part.entity.Part; import com.xujie.modules.part.service.Iface.IPartService; +import com.xujie.modules.srm.service.SrmPaymentProposalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +29,9 @@ public class PartController { @Autowired private IPartService baseService; + @Autowired + private SrmPaymentProposalService srmPaymentProposalService; + /** * 保存数据 */ @@ -62,10 +67,10 @@ public class PartController { /** * 根据主键获取实体对象 */ - @PostMapping("/get") - public R get(@RequestBody Part data) { - baseService.get(data); - return R.ok(); + @PostMapping("/getPart") + public R getPart(@RequestBody Part data) { + Part part = baseService.getPart(data); + return R.ok().put("data", part); } diff --git a/src/main/java/com/xujie/modules/part/service/Iface/IPartService.java b/src/main/java/com/xujie/modules/part/service/Iface/IPartService.java index 3d5d22e..4d28cf1 100644 --- a/src/main/java/com/xujie/modules/part/service/Iface/IPartService.java +++ b/src/main/java/com/xujie/modules/part/service/Iface/IPartService.java @@ -22,7 +22,7 @@ public interface IPartService extends IService { List getListByModel(Part query); - Part get(Part model); + Part getPart(Part model); void delete(Part model); } diff --git a/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java b/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java index eeefe82..1a45356 100644 --- a/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java +++ b/src/main/java/com/xujie/modules/part/service/Impl/PartServiceImpl.java @@ -52,7 +52,7 @@ public class PartServiceImpl extends ServiceImpl implements IP } @Override - public Part get(Part model){ + public Part getPart(Part model){ List list = baseMapper.getListByModel(model); if(!CollectionUtils.isEmpty(list)){ return list.get(0);