Merge remote-tracking branch 'origin/master'

guoshilong

2022-07-28 7425196960cc7ecda7d2a09100e0c6456309ff64

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/stockfactory/controller/StockfactoryController.java

@@ -149,8 +149,8 @@
     * @return
     */
    @GetMapping("/selectStockIn")
    public R selectStockIn() {
        return R.data(stockfactoryService.selectStockIn());
    public R selectStockIn(@RequestParam String name) {
        return R.data(stockfactoryService.selectStockIn(name));
    }



 src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.java

@@ -40,5 +40,5 @@
    List<StockfactoryVO> selectStockfactoryPage(IPage page, StockfactoryVO stockfactory);
    List<StockfactoryVO> selectStockfactoryPages( StockfactoryVO stockfactory);
    List selectStockFa();
    List selectStockIn();
    List selectStockIn(String name);
}

 src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml

@@ -38,14 +38,18 @@

    <!--小程序农资列表-->
    <select id="selectStockIn" resultType="java.util.HashMap">
        SELECT s.id                AS id,
        SELECT DISTINCT s.id                AS id,
               s.agricultural_name AS agrname,
               s.factory_name      AS factoryname,
               c.dict_value        AS dic
        FROM sys_stockfactory s
                 LEFT JOIN (SELECT dict_key, dict_value
                            FROM blade_dict_biz
                            WHERE CODE = 'stockType' AND is_deleted = 0) c ON c.dict_key = s.type
        WHERE is_deleted = 0
        <if test="name!=null and name!=''">
            and (s.agricultural_name like  concat('%',#{name},'%') or s.register_number like  concat('%',#{name},'%') )
        </if>
    </select>

</mapper>

 src/main/java/org/springblade/modules/stockfactory/service/IStockfactoryService.java

@@ -41,5 +41,5 @@
    IPage<StockfactoryVO> selectStockfactoryPage(IPage<StockfactoryVO> page, StockfactoryVO stockfactory);
    List<StockfactoryVO> selectStockfactoryPages(StockfactoryVO stockfactory);
    List selectStockFa();
    List selectStockIn();
    List selectStockIn(String name);
}

 src/main/java/org/springblade/modules/stockfactory/service/impl/StockfactoryServiceImpl.java

@@ -51,8 +51,8 @@
    }

    @Override
    public List selectStockIn() {
        return baseMapper.selectStockIn();
    public List selectStockIn(String name) {
        return baseMapper.selectStockIn(name);
    }

}