Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

zouyu

10 小时以前 d2f503f72b5485bfee54ea296c7d0a9a243cea02

 inspect-server/src/main/java/com/ruoyi/inspect/mapper/DataAnalysisMapper.java

@@ -2,6 +2,7 @@

import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
import com.ruoyi.inspect.dto.DataAnalysisDto;
import com.ruoyi.inspect.dto.MaterialPropTableDTO;
import com.ruoyi.inspect.vo.RawMaterialSupplierVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,32 +20,45 @@
public interface DataAnalysisMapper {

    /**
     * 获取本周的原材料信息
     * 获取本周的物料属性信息
     *
     * @return
     */
    List<Map<String, Object>> getRawPassRateByBarChartByWeek(@Param("dto") DataAnalysisDto dataAnalysisDto);

    /**
     * 获取本月的原材料信息
     * 获取本月的物料属性信息
     *
     * @return
     */
    List<Map<String, Object>> getRawPassRateByBarChartByDay(@Param("dto") DataAnalysisDto dataAnalysisDto);

    /**
     * 获取本年的原材料信息
     * 获取本年的物料属性信息
     *
     * @return
     */
    List<Map<String, Object>> getRawPassRateByBarChartByYear(@Param("dto") DataAnalysisDto dataAnalysisDtor);

    /**
     * 查看原材料饼状图
     *
     * @return
     */
    Map<String, Object> getRawPassRateByCake(@Param("dto") DataAnalysisDto dataAnalysisDto);

    /**
     * 查看物料属性明细表格
     *
     * @param dataAnalysisDto 查找值
     * @return 明细表格
     */
    List<MaterialPropTableDTO> getMaterialPropTable(@Param("dto") DataAnalysisDto dataAnalysisDto);


    /**
     * 查询检测项集合
     *
     * @param dataAnalysisDto
     * @return
     */
@@ -52,6 +66,7 @@

    /**
     * 查询所有的
     *
     * @param dataAnalysisDto
     * @return
     */
@@ -62,12 +77,14 @@

    /**
     * 查询本月与上月合格率对比
     *
     * @return
     */
    List<Map<String, Object>> getRawUpMonth();

    /**
     * 查询检验项类型饼图
     *
     * @return
     */
    Map<String, Object> getOrderTypeCookie();