智慧农业后台管理
xiebin
2022-08-26 48f4a3f3ef8172d4f2735f0aadf15dbccb8e405a
农事查询和农资查询增加时间筛选
4 files modified
31 ■■■■■ changed files
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/stockrecord/vo/StockrecordVO.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/farm/mapper/FarmingRecordMapper.xml
@@ -260,6 +260,12 @@
        <if test="farm.strainId!=null and farm.strainId!=''">
            and sfr.strain_id = #{farm.strainId}
        </if>
        <if test="farm.startTime!=null and farm.startTime!=''">
            and sfr.create_time &gt;= #{farm.startTime}
        </if>
        <if test="farm.endTime!=null and farm.endTime!=''">
            and sfr.create_time &lt;= #{farm.endTime}
        </if>
        order by sfr.time desc,sfr.create_time desc
    </select>
    <select id="getDetails" resultType="org.springblade.modules.farm.vo.FarmingRecordVO">
src/main/java/org/springblade/modules/farm/vo/FarmingRecordVO.java
@@ -54,4 +54,14 @@
     * 农资公司名称
     */
    private String factoryName;
    /**
     * 开始时间
     */
    private String startTime;
    /**
     * 结束时间
     */
    private String endTime;
}
src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml
@@ -92,6 +92,12 @@
        <if test="stockrecord.deptId != null and stockrecord.deptId !=''">
            and st.dept_id = #{stockrecord.deptId}
        </if>
        <if test="stockrecord.startTime!=null and stockrecord.startTime!=''">
            and st.create_time &gt;= #{stockrecord.startTime}
        </if>
        <if test="stockrecord.endTime!=null and stockrecord.endTime!=''">
            and st.create_time &lt;= #{stockrecord.endTime}
        </if>
        ORDER BY st.create_time desc
    </select>
src/main/java/org/springblade/modules/stockrecord/vo/StockrecordVO.java
@@ -40,4 +40,13 @@
    String count;
    String codes;
    String agrname;
    /**
     * 开始时间
     */
    private String startTime;
    /**
     * 结束时间
     */
    private String endTime;
}