time1前添加前缀sys_stockrecord

guoshilong

2022-07-26 f63d7ab1d77f530d263e5e948771b24510273dfc

 src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml

@@ -151,13 +151,15 @@
        SELECT stf.id,
        stf.agricultural_name,
        stf.factory_name
        FROM sys_stockrecord st
            FROM
                 sys_stockrecord st
        LEFT JOIN (SELECT id, agricultural_name, factory_name,type FROM sys_stockfactory) stf
        ON st.stock_id1 = stf.id
        <if test="stock.stockType !=null and stock.stockType != '' ">
            WHERE stf.type =#{stock.stockType}
        </if>
        GROUP BY stf.id,
        GROUP BY
                 stf.id,
        stf.agricultural_name,
        stf.factory_name
        ) a
@@ -166,10 +168,10 @@
        WHERE stock_type1 = 1
        AND type1 = 0
        <if test="stock.startTime!=null and stock.startTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &gt;= #{stock.startTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &gt;= #{stock.startTime}
        </if>
        <if test="stock.endTime!=null and stock.endTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &lt;= #{stock.endTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &lt;= #{stock.endTime}
        </if>
        <if test="stock.deptId!=null and stock.deptId!=''">
            and dept_id = #{stock.deptId}
@@ -180,10 +182,10 @@
        WHERE stock_type1 = 1
        AND type1 = 1
        <if test="stock.startTime!=null and stock.startTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &gt;= #{stock.startTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &gt;= #{stock.startTime}
        </if>
        <if test="stock.endTime!=null and stock.endTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &lt;= #{stock.endTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &lt;= #{stock.endTime}
        </if>
        <if test="stock.deptId!=null and stock.deptId!=''">
            and dept_id = #{stock.deptId}
@@ -194,10 +196,10 @@
        WHERE stock_type1 = 0
        AND type1 = 0
        <if test="stock.startTime!=null and stock.startTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &gt;= #{stock.startTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &gt;= #{stock.startTime}
        </if>
        <if test="stock.endTime!=null and stock.endTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &lt;= #{stock.endTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &lt;= #{stock.endTime}
        </if>
        <if test="stock.deptId!=null and stock.deptId!=''">
            and dept_id = #{stock.deptId}
@@ -208,10 +210,10 @@
        WHERE stock_type1 = 0
        AND type1 = 1
        <if test="stock.startTime!=null and stock.startTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &gt;= #{stock.startTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &gt;= #{stock.startTime}
        </if>
        <if test="stock.endTime!=null and stock.endTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &lt;= #{stock.endTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &lt;= #{stock.endTime}
        </if>
        <if test="stock.deptId!=null and stock.deptId!=''">
            and dept_id = #{stock.deptId}
@@ -222,10 +224,10 @@
        WHERE stock_type1 = 0
        AND type1 = 2
        <if test="stock.startTime!=null and stock.startTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &gt;= #{stock.startTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &gt;= #{stock.startTime}
        </if>
        <if test="stock.endTime!=null and stock.endTime!=''">
            and DATE_FORMAT(time1,'%Y-%m-%d') &lt;= #{stock.endTime}
            and DATE_FORMAT(sys_stockrecord.time1,'%Y-%m-%d') &lt;= #{stock.endTime}
        </if>
        <if test="stock.deptId!=null and stock.deptId!=''">
            and dept_id = #{stock.deptId}