Browse Source

特批审核列表修改

anderx 2 years ago
parent
commit
ccdd8f10e4

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

@@ -1032,6 +1032,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
     <if test="specially == 3">
+  	  and dep.approval_aid= #{aid,jdbcType=VARCHAR}
       and  a.order_status=2
       <if test="approval ==0">
         and a.process_status in(4)
@@ -1046,9 +1047,6 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         <if test="manageType ==1">
           (4)
         </if>
-        <if test="manageType ==2">
-          (7)
-        </if>
       </if>
       <if test="approval ==2">
         and a.approval in
@@ -1058,9 +1056,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
         <if test="manageType ==1">
           (5,6)
         </if>
-        <if test="manageType ==2">
-          (8,9)
-        </if>
+
       </if>
     </if>
   	  <if test="specially !=3 ">
@@ -1210,6 +1206,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
      <if test="specially == 3">
+       and dep.approval_aid= #{aid,jdbcType=VARCHAR}
        and  a.order_status=2
        <if test="approval ==0">
          and a.process_status in(4)
@@ -1224,9 +1221,6 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
          <if test="manageType ==1">
            (4)
          </if>
-         <if test="manageType ==2">
-           (7)
-         </if>
        </if>
        <if test="approval ==2">
          and a.approval in
@@ -1236,9 +1230,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
          <if test="manageType ==1">
            (5,6)
          </if>
-         <if test="manageType ==2">
-           (8,9)
-         </if>
+
        </if>
      </if>
      <if test="specially !=3 ">

+ 2 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -935,13 +935,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}
 		if (in.getSpecially()==3){
+			params.put("aid", in.getAid());
 			if (TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.CED_ASSISTANT)){
 				params.put("manageType",0);
 			}else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
 				params.put("manageType",1);
-			}else if (TokenManager.hasRole(AFTConstants.VICE_CED)){
-				params.put("manageType",2);
-			}else {
+			}else  {
 				params.put("manageType",0);
 			}
 		}