Преглед изворни кода

新增无限制公出列表

anderx пре 1 година
родитељ
комит
9a63573ad7

+ 10 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1053,11 +1053,10 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 
   <sql id="selectOrderNewSql">
     <if test="specially ==12">
-      <if test="maxStatus !=null">
-        and toprc.max_status = #{maxStatus}
-      </if>
       <if test="manageType==0">
-        and toprc.max_process >= #{configType}
+        <if test="maxProcessStatus =null">
+          and toprc.max_process >= #{configType}
+        </if>
         <if test="maxProcessStatus =0">
           and toprc.max_process= #{configType}
         </if>
@@ -1065,6 +1064,10 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
           and toprc.max_process > #{configType}
           and toprc.max_process in (1,2,3,5)
         </if>
+        <if test="maxProcessStatus =2">
+          and toprc.max_process =4
+
+        </if>
       </if>
     </if>
     <if test="specially ==7">
@@ -1087,6 +1090,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       and a.outsource= #{outsource,jdbcType=INTEGER}
     </if>
     <if test="specially == 0">
+      <if test="maxStatus !=null">
+        and toprc.max_status = #{maxStatus}
+      </if>
       <if test="approval ==null">
         and a.approval in(0,1,2,4,5,7,8)
       </if>

+ 4 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1216,6 +1216,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (in.getSpecially()!=null&&(in.getSpecially()==0|| in.getSpecially()==1|| in.getSpecially()==2||
 				in.getSpecially()==4|| in.getSpecially()==5|| in.getSpecially()==7|| in.getSpecially()==10|| in.getSpecially()==11)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
+			if (in.getSpecially()==0){
+				params.put("maxStatus", in.getMaxStatus());
+			}
 			if (in.getSpecially()!=3&& in.getSpecially()!=4) {
 				if (in.getAid() ==null){
 					params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
@@ -1260,6 +1263,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}else  {
 				params.put("manageType",0);
 			}
+
 		}
 		params.put("specially", in.getSpecially());
 		if (StringUtils.isNotBlank(in.getName())) {