Browse Source

变更流程列表开发

anderx 3 years ago
parent
commit
9f0f168ca9

+ 9 - 3
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -511,6 +511,9 @@ select
 	<if test="processState==0">
 	and b.salesman_id= #{aid}
 	</if>
+    <if test="processState==1">
+      and d.manager_id= #{aid}
+    </if>
 	<if test="processState==3 and complete !=5">
 	and  x.aid=#{aid}  and a.process_state &gt;= 2
 	</if>
@@ -618,9 +621,12 @@ select
 	left join (select order_no, aid from order_examine where`type`=1 group by order_no,aid)x on a.order_no = x.order_no
 	</if>
 	where 1=1
-	<if test="processState==0">
-	and b.salesman_id= #{aid}
-	</if>
+    <if test="processState==0">
+      and b.salesman_id= #{aid}
+    </if>
+    <if test="processState==1">
+      and d.manager_id= #{aid}
+    </if>
 	<if test="processState==3 and complete !=5">
 	and  x.aid=#{aid}  and a.process_state &gt;= 2
 	</if>

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

@@ -551,7 +551,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (null!=timeType) parameter.put("timeType", timeType);
 		if (StringUtils.isNotBlank(startTime)) parameter.put("startTime", startTime);
 		if (StringUtils.isNotBlank(endTime)) parameter.put("endTime", endTime+" 23:59:59");
-		if (processState==1){
+		if (processState==2){
 			List<String > myDep;
 			if (deps!=null) {
 				myDep=departmentService.selectSubDeps(deps);

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

@@ -945,7 +945,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			Admin a =adminMapper.selectByPrimaryKey(t2.getSalesmanId());
 			if (t2.getProcessStatus()==ProcessStatus.YPYXJL.getCode()){
 				tl.setProcess(OrderLogProcess.YXJLTT.getCode());
-				t.setProjectStatus(ProcessStatus.YPYXGLY.getCode());
+				t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
 				aids.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), AFTConstants.SALESMAN_ADMIN));
 			}else if (t2.getProcessStatus()==ProcessStatus.YPYXGLY.getCode()){
 				tl.setProcess(OrderLogProcess.SH.getCode());