Przeglądaj źródła

新增营销管理员审核刷新复审数据

anderx 2 lat temu
rodzic
commit
ce5415d74c

+ 3 - 2
src/main/java/com/goafanti/common/enums/OrderLogProcess.java

@@ -1,10 +1,10 @@
 package com.goafanti.common.enums;
 package com.goafanti.common.enums;
 
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
-import org.apache.commons.lang3.StringUtils;
-
 
 
 public enum OrderLogProcess {
 public enum OrderLogProcess {
 //	流程1=提交,2=审核,3=驳回,4=特批,5=财务审核 ,25=项目总监审核,6=财务首付,7=项目订单派单,8=项目派单,9=项目完成,0=发起退单,10=退单完成,11=财务全款,
 //	流程1=提交,2=审核,3=驳回,4=特批,5=财务审核 ,25=项目总监审核,6=财务首付,7=项目订单派单,8=项目派单,9=项目完成,0=发起退单,10=退单完成,11=财务全款,
@@ -15,6 +15,7 @@ public enum OrderLogProcess {
 	BH(3, "驳回"),
 	BH(3, "驳回"),
 	TP(4, "特批通过"),
 	TP(4, "特批通过"),
 	CWSH(5, "财务审核"),
 	CWSH(5, "财务审核"),
+	CWFS(26,"财务复审"),
 	XMZJSH(25, "项目总监审核"),
 	XMZJSH(25, "项目总监审核"),
 	CWSF(6, "财务首付"),
 	CWSF(6, "财务首付"),
 	XMZJPD(7, "项目总监派单"),
 	XMZJPD(7, "项目总监派单"),

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

@@ -508,10 +508,13 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		tl.setAid(TokenManager.getAdminId());
 		tl.setAid(TokenManager.getAdminId());
 		tl.setOrderNo(t.getOrderNo());
 		tl.setOrderNo(t.getOrderNo());
 		if (TokenManager.hasRole(AFTConstants.FINANCE)){
 		if (TokenManager.hasRole(AFTConstants.FINANCE)){
-			tl.setProcess(OrderLogProcess.CWSH.getCode());
+
 			//财务审核当天未审核数量减一
 			//财务审核当天未审核数量减一
 			if (use.getFinanceId().equals(TokenManager.getAdminId())){
 			if (use.getFinanceId().equals(TokenManager.getAdminId())){
+				tl.setProcess(OrderLogProcess.CWSH.getCode());
 				orderNewService.financeCountOrderUnauditedSubtraction(use,0);
 				orderNewService.financeCountOrderUnauditedSubtraction(use,0);
+			}else {
+				tl.setProcess(OrderLogProcess.CWFS.getCode());
 			}
 			}
 		}else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
 		}else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)){
 			tl.setProcess(OrderLogProcess.XMZJSH.getCode());
 			tl.setProcess(OrderLogProcess.XMZJSH.getCode());