feat:供应商管理
This commit is contained in:
@@ -93,9 +93,9 @@ public class SupplierController extends AbstractFileUploadController implements
|
||||
@Operation(summary = "获得供应商")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier:query')")
|
||||
public CommonResult<SupplierRespVO> getSupplier(@RequestParam("id") Long id) {
|
||||
SupplierDO supplier = supplierService.getSupplier(id);
|
||||
return success(BeanUtils.toBean(supplier, SupplierRespVO.class));
|
||||
public CommonResult<SupplierExtendRespVO> getSupplier(@RequestParam("id") Long id) {
|
||||
SupplierExtendRespVO supplier = supplierService.getSupplier(id);
|
||||
return success(supplier);
|
||||
}
|
||||
|
||||
@GetMapping("/page")
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.zt.plat.module.qms.office.supplier.controller.admin;
|
||||
|
||||
import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentMainRespVO;
|
||||
import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentMainSaveReqVO;
|
||||
import com.zt.plat.module.qms.office.supplier.controller.vo.SupplierEvaluationPageReqVO;
|
||||
import com.zt.plat.module.qms.office.supplier.controller.vo.SupplierEvaluationRespVO;
|
||||
import com.zt.plat.module.qms.office.supplier.controller.vo.SupplierEvaluationSaveReqVO;
|
||||
@@ -57,14 +59,14 @@ public class SupplierEvaluationController extends AbstractFileUploadController i
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建供应商评价")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:create')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:create')")
|
||||
public CommonResult<SupplierEvaluationRespVO> createSupplierEvaluation(@Valid @RequestBody SupplierEvaluationSaveReqVO createReqVO) {
|
||||
return success(supplierEvaluationService.createSupplierEvaluation(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新供应商评价")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:update')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:update')")
|
||||
public CommonResult<Boolean> updateSupplierEvaluation(@Valid @RequestBody SupplierEvaluationSaveReqVO updateReqVO) {
|
||||
supplierEvaluationService.updateSupplierEvaluation(updateReqVO);
|
||||
return success(true);
|
||||
@@ -73,7 +75,7 @@ public class SupplierEvaluationController extends AbstractFileUploadController i
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除供应商评价")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:delete')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:delete')")
|
||||
public CommonResult<Boolean> deleteSupplierEvaluation(@RequestParam("id") Long id) {
|
||||
supplierEvaluationService.deleteSupplierEvaluation(id);
|
||||
return success(true);
|
||||
@@ -82,7 +84,7 @@ public class SupplierEvaluationController extends AbstractFileUploadController i
|
||||
@DeleteMapping("/delete-list")
|
||||
@Parameter(name = "ids", description = "编号", required = true)
|
||||
@Operation(summary = "批量删除供应商评价")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:delete')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:delete')")
|
||||
public CommonResult<Boolean> deleteSupplierEvaluationList(@RequestBody BatchDeleteReqVO req) {
|
||||
supplierEvaluationService.deleteSupplierEvaluationListByIds(req.getIds());
|
||||
return success(true);
|
||||
@@ -91,7 +93,7 @@ public class SupplierEvaluationController extends AbstractFileUploadController i
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得供应商评价")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:query')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:query')")
|
||||
public CommonResult<SupplierEvaluationRespVO> getSupplierEvaluation(@RequestParam("id") Long id) {
|
||||
SupplierEvaluationDO supplierEvaluation = supplierEvaluationService.getSupplierEvaluation(id);
|
||||
return success(BeanUtils.toBean(supplierEvaluation, SupplierEvaluationRespVO.class));
|
||||
@@ -99,10 +101,16 @@ public class SupplierEvaluationController extends AbstractFileUploadController i
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得供应商评价分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:query')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-evaluation:query')")
|
||||
public CommonResult<PageResult<SupplierEvaluationRespVO>> getSupplierEvaluationPage(@Valid SupplierEvaluationPageReqVO pageReqVO) {
|
||||
PageResult<SupplierEvaluationDO> pageResult = supplierEvaluationService.getSupplierEvaluationPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, SupplierEvaluationRespVO.class));
|
||||
PageResult<SupplierEvaluationRespVO> pageResult = supplierEvaluationService.getSupplierEvaluationPage(pageReqVO);
|
||||
return success(pageResult);
|
||||
}
|
||||
|
||||
@PostMapping("/createProcessInstance")
|
||||
@Operation(summary = "发起流程")
|
||||
public CommonResult<SupplierEvaluationRespVO> createProcessInstance(@Valid @RequestBody SupplierEvaluationSaveReqVO createReqVO) {
|
||||
return supplierEvaluationService.createProcessInstance(createReqVO);
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@@ -112,7 +120,7 @@ public class SupplierEvaluationController extends AbstractFileUploadController i
|
||||
public void exportSupplierEvaluationExcel(@Valid SupplierEvaluationPageReqVO pageReqVO,
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<SupplierEvaluationDO> list = supplierEvaluationService.getSupplierEvaluationPage(pageReqVO).getList();
|
||||
List<SupplierEvaluationRespVO> list = supplierEvaluationService.getSupplierEvaluationPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "供应商评价.xls", "数据", SupplierEvaluationRespVO.class,
|
||||
BeanUtils.toBean(list, SupplierEvaluationRespVO.class));
|
||||
|
||||
@@ -57,14 +57,14 @@ public class SupplierPropertiesController extends AbstractFileUploadController i
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建供应商属性")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-properties:create')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-properties:create')")
|
||||
public CommonResult<SupplierPropertiesRespVO> createSupplierProperties(@Valid @RequestBody SupplierPropertiesSaveReqVO createReqVO) {
|
||||
return success(supplierPropertiesService.createSupplierProperties(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新供应商属性")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-properties:update')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-properties:update')")
|
||||
public CommonResult<Boolean> updateSupplierProperties(@Valid @RequestBody SupplierPropertiesSaveReqVO updateReqVO) {
|
||||
supplierPropertiesService.updateSupplierProperties(updateReqVO);
|
||||
return success(true);
|
||||
@@ -73,7 +73,7 @@ public class SupplierPropertiesController extends AbstractFileUploadController i
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除供应商属性")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-properties:delete')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-properties:delete')")
|
||||
public CommonResult<Boolean> deleteSupplierProperties(@RequestParam("id") Long id) {
|
||||
supplierPropertiesService.deleteSupplierProperties(id);
|
||||
return success(true);
|
||||
@@ -91,7 +91,7 @@ public class SupplierPropertiesController extends AbstractFileUploadController i
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得供应商属性")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-properties:query')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-properties:query')")
|
||||
public CommonResult<SupplierPropertiesRespVO> getSupplierProperties(@RequestParam("id") Long id) {
|
||||
SupplierPropertiesDO supplierProperties = supplierPropertiesService.getSupplierProperties(id);
|
||||
return success(BeanUtils.toBean(supplierProperties, SupplierPropertiesRespVO.class));
|
||||
@@ -99,7 +99,7 @@ public class SupplierPropertiesController extends AbstractFileUploadController i
|
||||
|
||||
@GetMapping("/page")
|
||||
@Operation(summary = "获得供应商属性分页")
|
||||
@PreAuthorize("@ss.hasPermission('qms:supplier-properties:query')")
|
||||
// @PreAuthorize("@ss.hasPermission('qms:supplier-properties:query')")
|
||||
public CommonResult<PageResult<SupplierPropertiesRespVO>> getSupplierPropertiesPage(@Valid SupplierPropertiesPageReqVO pageReqVO) {
|
||||
PageResult<SupplierPropertiesDO> pageResult = supplierPropertiesService.getSupplierPropertiesPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, SupplierPropertiesRespVO.class));
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.zt.plat.module.qms.office.supplier.controller.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import lombok.*;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import com.zt.plat.framework.common.pojo.PageParam;
|
||||
@@ -50,4 +51,12 @@ public class SupplierEvaluationPageReqVO extends PageParam {
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
//==============扩展字段===============
|
||||
@Schema(description = "供应商名称")
|
||||
private String supplierName;
|
||||
|
||||
@Schema(description = "审批签名")
|
||||
private String signatureInfo;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.zt.plat.module.qms.office.supplier.controller.vo;
|
||||
|
||||
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
@@ -45,6 +46,7 @@ public class SupplierEvaluationRespVO {
|
||||
|
||||
@Schema(description = "流程审批状态", example = "2")
|
||||
@ExcelProperty("流程审批状态")
|
||||
@Dict(dicCode = "flow_status")
|
||||
private String flowStatus;
|
||||
|
||||
@Schema(description = "流程实例id", example = "24931")
|
||||
@@ -63,4 +65,13 @@ public class SupplierEvaluationRespVO {
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
//==============扩展字段===============
|
||||
@Schema(description = "供应商名称")
|
||||
private String supplierName;
|
||||
|
||||
@Schema(description = "审批签名")
|
||||
@ExcelProperty("审批签名")
|
||||
private String signatureInfo;
|
||||
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.zt.plat.module.qms.office.supplier.controller.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
@@ -45,4 +46,7 @@ public class SupplierEvaluationSaveReqVO {
|
||||
@Schema(description = "备注")
|
||||
private String remark;
|
||||
|
||||
@Schema(description = "审批签名")
|
||||
private String signatureInfo;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.zt.plat.module.qms.office.supplier.controller.vo;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.zt.plat.module.qms.office.supplier.dal.dataobject.SupplierPropertiesDO;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
||||
@Data
|
||||
public class SupplierExtendRespVO extends SupplierRespVO {
|
||||
|
||||
private String certification;
|
||||
|
||||
public String getCertification() {
|
||||
if (CollUtil.isNotEmpty(this.supplierPropertiesList)) {
|
||||
return this.supplierPropertiesList.stream().map(m -> m.getSubitemCode()).collect(Collectors.joining("、"));
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private List<SupplierPropertiesDO> supplierPropertiesList;
|
||||
|
||||
|
||||
}
|
||||
@@ -21,6 +21,12 @@ public class SupplierPageReqVO extends PageParam {
|
||||
@Schema(description = "类型", example = "1")
|
||||
private String type;
|
||||
|
||||
@Schema(description = "统一社会信用代码")
|
||||
private String creditCode;
|
||||
|
||||
@Schema(description = "注册日期")
|
||||
private LocalDateTime registerDate;
|
||||
|
||||
@Schema(description = "地址")
|
||||
private String address;
|
||||
|
||||
|
||||
@@ -29,6 +29,9 @@ public class SupplierPropertiesPageReqVO extends PageParam {
|
||||
@Schema(description = "名称", example = "王五")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "说明")
|
||||
private String content;
|
||||
|
||||
@Schema(description = "有效期开始")
|
||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||
private LocalDateTime[] startDate;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.zt.plat.module.qms.office.supplier.controller.vo;
|
||||
|
||||
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.*;
|
||||
|
||||
@@ -30,12 +31,17 @@ public class SupplierPropertiesRespVO {
|
||||
|
||||
@Schema(description = "子业务编码")
|
||||
@ExcelProperty("子业务编码")
|
||||
@Dict(dicCode = "")
|
||||
private String subitemCode;
|
||||
|
||||
@Schema(description = "名称", example = "王五")
|
||||
@ExcelProperty("名称")
|
||||
private String name;
|
||||
|
||||
@Schema(description = "说明")
|
||||
@ExcelProperty("说明")
|
||||
private String content;
|
||||
|
||||
@Schema(description = "有效期开始")
|
||||
@ExcelProperty("有效期开始")
|
||||
private LocalDateTime startDate;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user