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

变更审核人转交BUG修复

anderx пре 2 година
родитељ
комит
89e8131380

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

@@ -342,7 +342,10 @@
      <if test="type==4">
      <if test="type==4">
        ,type=0
        ,type=0
      </if>
      </if>
-	where status=0 and aid= #{aid} and order_no=#{orderNo}
+	where status=0 and aid= #{aid}
+	  <if test="orderNo !=null">
+	  and order_no=#{orderNo}
+      </if>
      <if test="type==0 or type==1">
      <if test="type==0 or type==1">
        and type= #{type}
        and type= #{type}
      </if>
      </if>

+ 4 - 4
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -267,13 +267,13 @@ public class AsyncUtils {
 			//System.out.println("同咨询师");
 			//System.out.println("同咨询师");
 			List<Integer> list = newOrderChangeMapper.selectProcess(3, aid);
 			List<Integer> list = newOrderChangeMapper.selectProcess(3, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 0);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 0);
-			orderExamineMapper.updateDimissionTransfer(aid, transferId,0);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,0,null);
 			pushChangeProcessZXS(list);
 			pushChangeProcessZXS(list);
 		}else if (useType.contains(AFTConstants.TECH)&&newType.contains(AFTConstants.TECH_MANAGER)){
 		}else if (useType.contains(AFTConstants.TECH)&&newType.contains(AFTConstants.TECH_MANAGER)){
 //			System.out.println("不同职业");
 //			System.out.println("不同职业");
 			List<Integer> list = newOrderChangeMapper.selectProcess(3, aid);
 			List<Integer> list = newOrderChangeMapper.selectProcess(3, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 3);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 3);
-			orderExamineMapper.updateDimissionTransfer(aid, transferId,3);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,3,null);
 			List<Integer> list2 = newOrderChangeMapper.selectProcess(4, transferId);
 			List<Integer> list2 = newOrderChangeMapper.selectProcess(4, transferId);
 			//如果转交后订单全通过了,则变更+1
 			//如果转交后订单全通过了,则变更+1
 			pushChangeProcessZXS(list);
 			pushChangeProcessZXS(list);
@@ -284,7 +284,7 @@ public class AsyncUtils {
 			List<Integer> list = newOrderChangeMapper.selectProcess(4, aid);
 			List<Integer> list = newOrderChangeMapper.selectProcess(4, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 1);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 1);
 			tOrderTaskMapper.updateDimissionTransferManager(aid, transferId);
 			tOrderTaskMapper.updateDimissionTransferManager(aid, transferId);
-			orderExamineMapper.updateDimissionTransfer(aid, transferId,1);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,1,null);
 			pushChangeProcessZXSJL(list);
 			pushChangeProcessZXSJL(list);
 		}else if (useType.contains(AFTConstants.TECH_MANAGER)&&newType.contains(AFTConstants.TECH)){
 		}else if (useType.contains(AFTConstants.TECH_MANAGER)&&newType.contains(AFTConstants.TECH)){
 //			System.out.println("不同职业");
 //			System.out.println("不同职业");
@@ -292,7 +292,7 @@ public class AsyncUtils {
 			List<Integer> list = newOrderChangeMapper.selectProcess(4, aid);
 			List<Integer> list = newOrderChangeMapper.selectProcess(4, aid);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 4);
 			tOrderTaskMapper.updateDimissionTransfer(aid, transferId, 4);
 			tOrderTaskMapper.updateDimissionTransferManager(aid, null);
 			tOrderTaskMapper.updateDimissionTransferManager(aid, null);
-			orderExamineMapper.updateDimissionTransfer(aid, transferId,4);
+			orderExamineMapper.updateDimissionTransfer(aid, transferId,4,null);
 			List<Integer> list2 = newOrderChangeMapper.selectProcess(3, transferId);
 			List<Integer> list2 = newOrderChangeMapper.selectProcess(3, transferId);
 			pushChangeProcessZXSJL(list);
 			pushChangeProcessZXSJL(list);
 			pushChangeProcessZXS(list2);
 			pushChangeProcessZXS(list2);