春风项目四线(合箱线、总装线)
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
wujian
2024-01-20 b849f1f5004bbad8f47bea2f4471e6ff699fe73c 
 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java


@@ -1,25 +1,23 @@


package com.jcdm.main.bs.formulaChild.controller;




import java.util.List;


import javax.servlet.http.HttpServletResponse;


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.PutMapping;


import org.springframework.web.bind.annotation.DeleteMapping;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import com.jcdm.common.annotation.Log;


import com.jcdm.common.core.controller.BaseController;


import com.jcdm.common.core.domain.AjaxResult;


import com.jcdm.common.core.page.TableDataInfo;


import com.jcdm.common.enums.BusinessType;


import com.jcdm.common.utils.poi.ExcelUtil;


import com.jcdm.main.bs.formulaChild.Query.ProductProcessQuery;


import com.jcdm.main.bs.formulaChild.domain.BsFormulaChildInfo;


import com.jcdm.main.bs.formulaChild.service.IBsFormulaChildInfoService;


import com.jcdm.common.utils.poi.ExcelUtil;


import com.jcdm.common.core.page.TableDataInfo;


import com.jcdm.main.bs.formulaChild.service.impl.ProductProcessService;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.web.bind.annotation.*;




import javax.servlet.http.HttpServletResponse;


import java.util.Comparator;


import java.util.List;


import java.util.stream.Collectors;




/**


 * 配方配置子信息Controller


@@ -34,6 +32,11 @@


    @Autowired


    private IBsFormulaChildInfoService bsFormulaChildInfoService;




    @Autowired


    private ProductProcessService productProcessService;




    private static final String ZERO = "0";




    /**


     * 查询配方配置子信息列表


     */


@@ -46,8 +49,22 @@


        for (BsFormulaChildInfo formulaChildInfo : list) {


            formulaChildInfo.setSort(formulaChildInfo.getStepSort());


            formulaChildInfo.setAddress(formulaChildInfo.getTechRequirement());


            formulaChildInfo.setImg(formulaChildInfo.getOperationSteps());


            formulaChildInfo.setImg(formulaChildInfo.getPicture());


        }


        list = list.stream()


                .filter(x -> !ZERO.equals(x.getSort())).sorted(Comparator.comparing(BsFormulaChildInfo::getSort)).collect(Collectors.toList());


        return getDataTable(list);


    }




    /**


     * 查询工艺流程


     * @param productProcessQuery query


     * @return list


     */


    @PostMapping("/getProductProcess")


    public TableDataInfo getProductProcess(@RequestBody ProductProcessQuery productProcessQuery)


    {


        List<BsFormulaChildInfo> list = productProcessService.getProductProcess(productProcessQuery);


        return getDataTable(list);


    }