Browse Source

离职一键转交修改

anderx 3 years ago
parent
commit
12de4b8bef

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

@@ -762,10 +762,10 @@ select
                and c.process_state in (#{type}) group by c.id)x on n.id =x.id
       left join (select a.order_no ,group_concat(DISTINCT b.name)name from order_examine a left join admin b on a.aid=b.id
                    where 1=1
-                   <if test="type==2">
+                   <if test="type==3">
                    and  a.type=0
                    </if>
-                  <if test="type==3">
+                  <if test="type==4">
                   and   a.type=1
                   </if>
       group by a.order_no ) a on n.order_no =a.order_no

+ 7 - 4
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -15,6 +15,9 @@ import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.order.enums.ChangeState;
+import com.goafanti.order.enums.NewProjectStatus;
+import com.goafanti.order.enums.OrderChangeProcess;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -272,10 +275,10 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 			for (Integer i : clist) {
 				NewOrderChangeBo changeBo = newOrderChangeMapper.selectById(i);
 				int x=1;
-				if (changeBo.getProcessState()==2){
+				if (changeBo.getProcessState()== OrderChangeProcess.JSY.getCode()){
 					x=orderExamineMapper.checkCountStatus(changeBo.getOrderNo(), 0,0);
 
-				}else if (changeBo.getProcessState()==3){
+				}else if (changeBo.getProcessState()==OrderChangeProcess.JSJL.getCode()){
 					  x=orderExamineMapper.checkCountStatus(changeBo.getOrderNo(), 1,0);
 				}
 				if (x==0){
@@ -291,8 +294,8 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 					newOrderChangeMapper.updateByPrimaryKeySelective(changeBo);
 				}
 			}
-			newOrderChangeMapper.updateTaskExamineName(aid,transferId,2);
-			newOrderChangeMapper.updateTaskExamineName(aid,transferId,3);
+			newOrderChangeMapper.updateTaskExamineName(aid,transferId,OrderChangeProcess.JSY.getCode());
+			newOrderChangeMapper.updateTaskExamineName(aid,transferId,OrderChangeProcess.JSJL.getCode());
 			taskAttributionLogMapper.insertList(aid, transferId, date);
 			tTaskLogMapper.updateDimissionTransfer(aid, transferId);
 		}