Ver código fonte

批量回款统计修改

anderx 2 anos atrás
pai
commit
059ebf78b5

+ 4 - 1
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -292,7 +292,7 @@
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	</if>
       <if test="mergeStatus != null">
-          and merge_status = #{mergeStatus}
+          and a.merge_status = #{mergeStatus}
       </if>
       <if test="orderDeps != null">
           and b.order_dep in
@@ -334,6 +334,9 @@
 	<if test="corporateName != null">
 	and a.corporate_name like concat('%',#{corporateName},'%')
 	</if>
+        <if test="mergeStatus != null">
+            and a.merge_status = #{mergeStatus}
+        </if>
         <if test="orderDeps != null">
             and b.order_dep in
             <foreach close=")" collection="orderDeps" item="depId" open="(" separator=",">