|
|
@@ -1858,7 +1858,7 @@
|
|
1858
|
1858
|
sqk.smoke_point, sqk.reeze_test, sqk.residual_solvent, sqk.lead, sqk.total_arsenic, sqk.aflatoxin, sqk.quailtycard_id,
|
|
1859
|
1859
|
sqk.butyl_phenol, sqk.flag_type,
|
|
1860
|
1860
|
sqk.qyqy,sqk.qydbh,sqk.zblb,sqk.jdrxm,sqk.ypbh,sqk.sfzcccnx,
|
|
1861
|
|
- sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route, sqk.zhycsj
|
|
|
1861
|
+ sqk.jylb, sqk.qfrq,sqk.ypsl,sqk.dbsl,sqk.ypdj, sqk.file_route, sqk.zhycsj,sqk.process_state
|
|
1862
|
1862
|
</sql>
|
|
1863
|
1863
|
|
|
1864
|
1864
|
<select id="queryPrimaryKey" resultMap="BaseResultMap">
|
|
|
@@ -1920,6 +1920,9 @@
|
|
1920
|
1920
|
<if test="sealDate != null" >
|
|
1921
|
1921
|
and sq.check_time <= #{sealDate}
|
|
1922
|
1922
|
</if>
|
|
|
1923
|
+ <if test="processState !=null">
|
|
|
1924
|
+ and sq.process_state = #{processState}
|
|
|
1925
|
+ </if>
|
|
1923
|
1926
|
<!--区分粮情卡的数据-->
|
|
1924
|
1927
|
and sq.flag_type is null
|
|
1925
|
1928
|
</where>
|