Lianxun_Java.git

			@@ -326,7 +326,7 @@
			p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price
			purchasePrice,p.original_stock originalStock,
			r.res_name resName,r.res_code resCode,
			r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName,
			r.price,r.price standardPrice,r.stock,rst.name rstName,rst1.name parentRstName,rss.spec_name specName,rs.supplier_name supplierName,
			td1.name unitCodeName,
			td2.name miniUnitCodeName
			from
			@@ -336,6 +336,7 @@
			left join t_dict td2 on r.mini_unit_code = td2.status_cd and td2.table_name = 'resource_store' and td2.table_columns = 'unit_code'
			LEFT JOIN resource_supplier rs on p.rs_id=rs.rs_id
			LEFT JOIN resource_store_type rst on r.rst_id=rst.rst_id
			LEFT JOIN resource_store_type rst1 on r.parent_rst_id=rst1.rst_id
			LEFT JOIN resource_store_specification rss on r.rss_id=rss.rss_id
			where 1=1
			and p.status_cd = '0'
			@@ -470,4 +471,26 @@
			and ahp.BUSINESS_KEY_ = #{businessKey}
			</if>
			</select>

			<!--获得获取流程任务id-->
			<select id="getActRuTaskId" parameterType="Map" resultType="Map">
			SELECT art.ID_ actRuTaskId FROM act_ru_execution are
			LEFT JOIN act_ru_task art ON are.PROC_INST_ID_=art.PROC_INST_ID_
			where 1 = 1
			<if test="businessKey !=null and businessKey != ''">
			and are.BUSINESS_KEY_ = #{businessKey}
			</if>
			</select>

			<!-- 修改流程任务信息 -->
			<update id="updateActRuTaskById" parameterType="Map">
			update act_ru_task t set SUSPENSION_STATE_=1
			<if test="assigneeUser != null and assigneeUser != ''">
			,t.ASSIGNEE_ = #{assigneeUser}
			</if>
			where 1=1
			<if test="actRuTaskId !=null and actRuTaskId != ''">
			and t.ID_= #{actRuTaskId}
			</if>
			</update>
			</mapper>