Merge remote-tracking branch 'origin/master'

zss

2023-09-25 5d24aead2d1a45452942ddfc300fe6a232301a99

 base-server/src/main/java/com/yuanchu/mom/controller/TechnicalModelController.java

@@ -2,7 +2,8 @@


import com.yuanchu.mom.pojo.dto.TechnicalModelDto;
import com.yuanchu.mom.pojo.dto.TechnologyTemplateDto;
import com.yuanchu.mom.service.TechnicalModelService;
import com.yuanchu.mom.utils.ServletUtils;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -11,7 +12,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.TechnicalModelService;

import javax.servlet.http.HttpServletResponse;


/**
@@ -31,11 +33,11 @@

    @ApiOperation(value = "查询技术指标维护列表-->左边二级展示工序和工艺")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "type", value = "类型(为空=0橡胶连接器)", dataTypeClass = Integer.class, required = true),
            @ApiImplicitParam(name = "type", value = "类型(为空=0橡胶连接器)", dataTypeClass = String.class, required = true),
            @ApiImplicitParam(name = "message", value = "搜索内容", dataTypeClass = String.class)
    })
    @GetMapping("/selectAllTechTem")
    public Result selectAllTechTem(Integer type, String message) {
    public Result selectAllTechTem(String type, String message) {
        return Result.success(technicalModelService.selectAllTechTem(type, message));
    }

@@ -50,35 +52,32 @@

    @ApiOperation(value = "新增技术指标维护-->选择工序和工艺")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "type", value = "类型", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "type", value = "类型", dataTypeClass = String.class, required = true)
    })
    @GetMapping("/chooseTechFath")
    public Result chooseTechFath(Integer type) {
    public Result chooseTechFath(String type) {
        return Result.success(technicalModelService.chooseTechFath(type));
    }

    @ApiOperation(value = "新增技术指标维护-->选择项目父类")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
            @ApiImplicitParam(name = "techTemId", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/chooseProFath")
    public Result chooseProFath(Integer id) {
        return Result.success(technicalModelService.chooseProFath(id));
    public Result chooseProFath(Integer techTemId) {
        return Result.success(technicalModelService.chooseProFath(techTemId));
    }

    @ApiOperation(value = "新增技术指标维护")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "工艺路线id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/addTechMode")
    public Result addTechMode(Integer id, @Validated @RequestBody TechnicalModelDto technicalModelDto) {
        technicalModelService.addTechMode(id, technicalModelDto);
    public Result addTechMode(@Validated @RequestBody TechnicalModelDto technicalModelDto) {
        technicalModelService.addTechMode(technicalModelDto);
        return Result.success("新增成功!");
    }

    @ApiOperation(value = "根据id查询详情")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class,required = true)
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class, required = true)
    })
    @GetMapping("/selecTechById")
    public Result selecTechById(Integer id) {
@@ -87,27 +86,27 @@

    @ApiOperation(value = "编辑")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class,required = true)
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/writeTechById")
    public Result writeTechById(Integer id,@Validated @RequestBody TechnicalModelDto technicalModelDto) {
        technicalModelService.writeTechById(id,technicalModelDto);
        return Result.success("修改"+id+"成功!");
    public Result writeTechById(Integer id, @Validated @RequestBody TechnicalModelDto technicalModelDto) {
        technicalModelService.writeTechById(id, technicalModelDto);
        return Result.success("修改" + id + "成功!");
    }

    @ApiOperation(value = "删除")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class,required = true)
            @ApiImplicitParam(name = "id", value = "技术指标id", dataTypeClass = Integer.class, required = true)
    })
    @PostMapping("/delTechById")
    public Result delTechById(Integer id) {
        technicalModelService.delTechById(id);
        return Result.success("删除"+id+"成功!");
        return Result.success("删除" + id + "成功!");
    }

    @ApiOperation(value = "批量删除")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "ids", value = "技术指标id", dataTypeClass = String.class,required = true)
            @ApiImplicitParam(name = "ids", value = "技术指标id", dataTypeClass = String.class, required = true)
    })
    @PostMapping("/delAllTech")
    public Result delAllTech(String ids) {
@@ -115,5 +114,13 @@
        return Result.success("批量删除成功!");
    }

    @ApiOperation(value = "导出")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "type", value = "类型", dataTypeClass = String.class, required = true)
    })
    public void downloadDataValueExcel(String type){
        HttpServletResponse response = ServletUtils.getResponse();
        technicalModelService.downloadDataValueExcel(response,type);
    }
}