Explorar o código

合同变更列表修改

anderx hai 1 ano
pai
achega
06915cdc0a

+ 1 - 2
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -685,10 +685,9 @@ from new_order_change a where 1 = 1 and status in (0,1,2,3)
     <if test="complete ==1 and processState == 6">
       and (a.process_state in(6)  and a.status in (0,1,2,3,5,6))
     </if>
-    <if test="complete ==1 and processState > 6">
+    <if test="complete ==1 and processState > 6 and processState &lt; 8">
       and (a.process_state = #{processState}  and a.status =1)
     </if>
-
     <if test="complete ==2 and processState != 6 and processState != 8 and processState != 9 and processState !=3 and processState !=4">
       and a.process_state &gt; #{processState}
     </if>

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

@@ -787,7 +787,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					noc.setProcessState(OrderChangeProcess.YXJL.getCode());
 				}else {
 					//增加营销经理的日志
-					date.setTime(date.getTime()+500);
+					date.setTime(date.getTime()+200);
 					addOrderChangeLog("未设置营销经理自动通过", 2, t.getOrderNo(), noc.getId(),date);
 					//营销经理不存在判定营销管理员
 					List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
@@ -799,7 +799,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					}
 					//如果自己是审核人员则跳过
 					if (flag){
-						date.setTime(date.getTime()+500);
+						date.setTime(date.getTime()+200);
 						addOrderChangeLog("审核人重复自动通过", 2, t.getOrderNo(), noc.getId(),date);
 						noc.setProcessState(OrderChangeProcess.JSY.getCode());
 						if (t.getType()==OrderChangeType.CB.getCode()||