Ver código fonte

新增公出情况列表

anderx 1 ano atrás
pai
commit
fd044e1997

+ 11 - 5
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -448,11 +448,15 @@
         <if test="type==4">
             and a.assist in(0,1)
             and e.aid = #{aid}
-            and a.public_type in (1,2)
+            <if test="status==null">and a.public_type in (1,2) </if>
+            <if test="status==1">and a.public_type in (1) </if>
+            <if test="status==2">and a.public_type in (2) </if>
         </if>
         <if test="type==5">
-            and a.tech_start_process=1
             and ton.salesman_id =#{aid}
+            <if test="status==null">and a.tech_start_process in (1,2) </if>
+            <if test="status==1">and a.tech_start_process in (1) </if>
+            <if test="status==2">and a.tech_start_process in (2) </if>
         </if>
         <if test="type==6">
             and a.type=3 and a.assist=2
@@ -469,8 +473,10 @@
         <if test="userName !=null">
             and e.nickname like concat('%',#{userName},'%')
         </if>
-        <if test="status !=null">
-            and a.status = #{status}
+        <if test="type!=4 and type !=5">
+            <if test="status !=null ">
+                and a.status = #{status}
+            </if>
         </if>
     </sql>
     <select id="countPublicRelease" resultType="java.lang.Integer">
@@ -833,7 +839,7 @@
                  left join public_release_details b on a.id=b.prid
                  left join `user` e on b.uid=e.id
         where a.assist in(0,1)
-          and a.public_type =1
+          and(a.public_type =1 or  a.tech_start_process=1)
           and a.status =1
           and e.aid =  #{aid}
     </select>