github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

客户产品列表

pull/451/head
starrysky 2019-08-23 10:27:09 +08:00
parent 7dc3d76ece
commit 1a35ef814a
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/domain/ProductInfo.java
View File

@ -3,6 +3,8 @@ package me.zhengjie.modules.wms.bd.domain;
import lombok.Data; import lombok.Data;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import org.hibernate.annotations.CreationTimestamp;
import javax.persistence.*; import javax.persistence.*;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.sql.Timestamp; import java.sql.Timestamp;
@ -68,10 +70,12 @@ public class ProductInfo implements Serializable {
// 创建时间 // 创建时间
@Column(name = "create_time") @Column(name = "create_time")
@CreationTimestamp
private Timestamp createTime; private Timestamp createTime;
// 更新时间 // 更新时间
@Column(name = "update_time") @Column(name = "update_time")
@CreationTimestamp
private Timestamp updateTime; private Timestamp updateTime;
// @NotNull // @NotNull

6
eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/CustomerInfoController.java
View File

@ -27,15 +27,15 @@ public class CustomerInfoController {
@Log("分页查询客户信息") @Log("分页查询客户信息")
@ApiOperation(value = "分页查询客户信息") @ApiOperation(value = "分页查询客户信息")
@GetMapping(value = "/customerInfos") @GetMapping(value = "/queryCustomerInfoPage")
@PreAuthorize("hasAnyRole('ADMIN','BDCUSTOMERINFO_ALL','BDCUSTOMERINFO_SELECT')") @PreAuthorize("hasAnyRole('ADMIN','BDCUSTOMERINFO_ALL','BDCUSTOMERINFO_SELECT')")
public ResponseEntity getCustomerInfos(CustomerInfoQueryCriteria criteria, Pageable pageable){ public ResponseEntity queryCustomerInfoPage(CustomerInfoQueryCriteria criteria, Pageable pageable){
return new ResponseEntity(customerInfoService.queryAll(criteria,pageable),HttpStatus.OK); return new ResponseEntity(customerInfoService.queryAll(criteria,pageable),HttpStatus.OK);
} }
@Log("查询客户信息列表") @Log("查询客户信息列表")
@ApiOperation(value = "查询客户信息列表") @ApiOperation(value = "查询客户信息列表")
@GetMapping(value = "/customerInfo/queryCustomerInfoList") @GetMapping(value = "/queryCustomerInfoList")
@PreAuthorize("hasAnyRole('ADMIN','BDCUSTOMERINFO_ALL','BDCUSTOMERINFO_SELECT')") @PreAuthorize("hasAnyRole('ADMIN','BDCUSTOMERINFO_ALL','BDCUSTOMERINFO_SELECT')")
public ResponseEntity queryCustomerInfoList(CustomerInfoQueryCriteria criteria){ public ResponseEntity queryCustomerInfoList(CustomerInfoQueryCriteria criteria){
return new ResponseEntity(customerInfoService.queryAll(criteria),HttpStatus.OK); return new ResponseEntity(customerInfoService.queryAll(criteria),HttpStatus.OK);

6
eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/ProductInfoController.java
View File

@ -45,9 +45,9 @@ public class ProductInfoController {
@Log("分页查询产品资料") @Log("分页查询产品资料")
@ApiOperation(value = "分页查询产品资料") @ApiOperation(value = "分页查询产品资料")
@GetMapping(value = "/productInfo") @GetMapping(value = "/queryProductInfoPage")
@PreAuthorize("hasAnyRole('ADMIN','BDPRODUCTINFO_ALL','BDPRODUCTINFO_SELECT')") @PreAuthorize("hasAnyRole('ADMIN','BDPRODUCTINFO_ALL','BDPRODUCTINFO_SELECT')")
public ResponseEntity getProductInfos(ProductInfoQueryCriteria criteria, Pageable pageable){ public ResponseEntity queryProductInfoPage(ProductInfoQueryCriteria criteria, Pageable pageable){
return new ResponseEntity(productInfoService.queryAll(criteria,pageable),HttpStatus.OK); return new ResponseEntity(productInfoService.queryAll(criteria,pageable),HttpStatus.OK);
} }
@ -86,7 +86,7 @@ public class ProductInfoController {
@Log("查看产品资料详情") @Log("查看产品资料详情")
@GetMapping(value = "/productInfo/{id}") @GetMapping(value = "/productInfo/{id}")
public ResponseEntity getMessureUnit(@PathVariable Long id){ public ResponseEntity getProductInfoById(@PathVariable Long id){
return new ResponseEntity(productInfoService.findById(id), HttpStatus.OK); return new ResponseEntity(productInfoService.findById(id), HttpStatus.OK);
} }