Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-business-qinghai into dev

src/main/java/com/chinaitop/depot/rp/mapper/BusinessRpBiweeklyReportGrainStockMapper.xml

@@ -265,7 +265,7 @@
 	crk_qh.data_crkyw_ckcmz_default m2
 	INNER JOIN crk_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno
 	INNER JOIN crk_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-	where m4.jhdID = #{rpReportId} and m4.lspz = #{grainVarietyid} and m2.jmsj BETWEEN #{startDate} and #{endDate}   -- 计划id+粮食品种+ 指定时间
+	where m4.jhdID = #{rpReportId} and m4.lspz = #{grainVarietyId} and m2.jmsj BETWEEN #{startDate} and #{endDate}   -- 计划id+粮食品种+ 指定时间
   </insert>
     <insert id="insertRk"  >
      INSERT INTO depot_qh.business_rp_biweekly_report_grain_stock (
@@ -280,12 +280,11 @@
 	NOW(),
 	2,
 	#{rpBiweeklyReportGrainId},
-m2.cpzsj,
 	m3.DataID
         FROM
         crk_qh.data_crkyw_cpz_default m2
         INNER JOIN crk_qh.data_crkyw_rmdj_default m3 ON m3.bizno = m2.bizno
         INNER JOIN crk_qh.data_crkyw_tzdxx_default m4 on m3.tzdbh = m4.tzdbh
-             where m4.jhdID = #{rpReportId} and m4.lspz = #{grainVarietyid} and m2.cpzsj BETWEEN #{startDate} and #{endDate}   -- 计划id+粮食品种+ 指定时间
+             where m4.jhdID = #{rpReportId} and m4.lspz = #{grainVarietyId} and m2.cpzsj BETWEEN #{startDate} and #{endDate}   -- 计划id+粮食品种+ 指定时间
   </insert>
 </mapper>