增加秸秆

This commit is contained in:
zy 2025-12-02 19:35:03 +08:00
parent b92cc9a7e0
commit f2f94ec05d
3 changed files with 10 additions and 4 deletions

View File

@ -17,6 +17,7 @@
<result column="mulch_remain" property="mulchRemain"/>
<result column="updated_time" property="updatedTime"/>
<result column="station_code" property="stationCode"/>
<result column="STRAW_REMAIN" property="strawRemain"/>
<association property="stationName" column="station_code" select="getStationName"/>
</resultMap>
@ -25,7 +26,7 @@
</select>
<sql id="baseSql">
ID,CROP_NAME,MULCH_REMAIN,MULCH_YEAR,SAMP_TIME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,STATION_CODE,M_PICS,M_NOTE
ID,CROP_NAME,MULCH_REMAIN,MULCH_YEAR,SAMP_TIME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,STATION_CODE,M_PICS,M_NOTE,STRAW_REMAIN
</sql>
<select id="pages" resultMap="baseResultMap">

View File

@ -18,6 +18,7 @@
<result column="mulch_remain" property="mulchRemain"/>
<result column="updated_time" property="updatedTime"/>
<result column="station_code" property="stationCode"/>
<result column="STRAW_REMAIN" property="strawRemain"/>
<association property="stationName" column="station_code" select="getStationName"/>
</resultMap>
@ -26,7 +27,7 @@
</select>
<sql id="baseSql">
ID,CROP_NAME,MULCH_REMAIN,MULCH_YEAR,SAMP_TIME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,STATION_CODE,M_PICS,M_NOTE
ID,CROP_NAME,MULCH_REMAIN,MULCH_YEAR,SAMP_TIME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,STATION_CODE,M_PICS,M_NOTE,STRAW_REMAIN
</sql>
<select id="pages" resultMap="baseResultMap">

View File

@ -42,9 +42,13 @@ public class SurvMulchRecord implements Serializable {
@ApiModelProperty(value = "作物")
private String cropName;
/**地膜残留量(g/hm2)*/
@Excel(name = "地膜残留量(g/hm2)", width = 15)
@ApiModelProperty(value = "地膜残留量(g/hm2)")
@Excel(name = "地膜残留量(kg/hm2)", width = 15)
@ApiModelProperty(value = "地膜残留量(kg/hm2)")
private String mulchRemain;
/**秸秆残留量(g/hm2)*/
@Excel(name = "秸秆残留量(kg/hm2)", width = 15)
@ApiModelProperty(value = "秸秆残留量(kg/hm2)")
private String strawRemain;
/**覆膜年份*/
@Excel(name = "覆膜年份", width = 15, format = "yyyy")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy")