Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

xuhy

2024-12-30 4667d1e9ac2b01a6753eb8a87fb721051bf07ac4

 manage/src/main/resources/mapping/TOrderAccountingMapper.xml

@@ -39,17 +39,17 @@
                      <if test="query.phone != null and query.phone != ''">
                        and t1.phone like concat('%',#{query.phone},'%')
                    </if>
        <if test="req.startTime != null and req.startTime!=''">
            and (t1.createTime between #{req.startTime} and #{req.endTime})
        <if test="query.startTime != null and query.startTime!=''">
            and (t1.createTime between #{query.startTime} and #{query.endTime})
        </if>
        <if test="req.startMoney != null ">
            and (t1.payMoney between #{req.startMoney} and #{req.endMoney})
        <if test="query.startMoney != null ">
            and (t1.payMoney between #{query.startMoney} and #{query.endMoney})
        </if>
                    <if test="req.isAccounting != null ">
                        and t1.isAccounting = #{req.isAccounting}
                    <if test="query.isAccounting != null ">
                        and t1.isAccounting = #{query.isAccounting}
                    </if>
                    <if test="req.storeId != null ">
                        and t1.storeId = #{req.storeId}
                    <if test="query.storeId != null ">
                        and t1.storeId = #{query.storeId}
                    </if>
                            order by t1.isAccounting desc
    </select>