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

部门列表,新增、修改接口的修改

anderx пре 2 година
родитељ
комит
1a14ac9932

+ 6 - 9
src/main/java/com/goafanti/order/enums/ApprovalNewState.java

@@ -7,23 +7,20 @@ public enum ApprovalNewState {
 	/** 非特批 **/
 	/** 非特批 **/
 	FTP(0,"非特批"),
 	FTP(0,"非特批"),
 	/** 总裁待审核 **/
 	/** 总裁待审核 **/
-	ZCDSH(1,"总裁待审核"),
+	ZCDSH(1,"特批待审核"),
 	/** 总裁通过 **/
 	/** 总裁通过 **/
-	ZCTG(2,"总裁通过"),
+	ZCTG(2,"特批通过"),
 	/** 总裁驳回 **/
 	/** 总裁驳回 **/
-	ZCBH(3,"总裁驳回"),
+	ZCBH(3,"特批驳回"),
 	/** 董事长待审核 **/
 	/** 董事长待审核 **/
 	DSZDSH(4,"董事长待审核"),
 	DSZDSH(4,"董事长待审核"),
 	/** 董事长通过 **/
 	/** 董事长通过 **/
 	DSZTG(5,"董事长通过"),
 	DSZTG(5,"董事长通过"),
 	/** 董事长驳回 **/
 	/** 董事长驳回 **/
 	DSZBH(6,"董事长驳回"),
 	DSZBH(6,"董事长驳回"),
-	/** 总裁待审核 **/
-	FZCDSH(7,"副总裁待审核"),
-	/** 总裁通过 **/
-	FZCTG(8,"副总裁通过"),
-	/** 总裁驳回 **/
-	FZCBH(9,"副总裁驳回"),
+//	FZCDSH(7,"副总裁待审核"),
+//	FZCTG(8,"副总裁通过"),
+//	FZCBH(9,"副总裁驳回"),
 	/** 无效 **/
 	/** 无效 **/
 	INVALID(10, "INVALID");
 	INVALID(10, "INVALID");
 
 

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

@@ -551,17 +551,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			//特批逻辑处理
 			//特批逻辑处理
 			if (t2.getApproval()==ApprovalNewState.ZCBH.getCode()||
 			if (t2.getApproval()==ApprovalNewState.ZCBH.getCode()||
 					t2.getApproval()==ApprovalNewState.DSZBH.getCode()||
 					t2.getApproval()==ApprovalNewState.DSZBH.getCode()||
-					t2.getApproval()== ApprovalNewState.FZCBH.getCode()||
 					t2.getApproval()==ApprovalNewState.ZCDSH.getCode()){
 					t2.getApproval()==ApprovalNewState.ZCDSH.getCode()){
 				if (a.getId().equals(AFTConstants.CAOJIN_AID)){
 				if (a.getId().equals(AFTConstants.CAOJIN_AID)){
 					t.setApproval(ApprovalNewState.DSZDSH.getCode());
 					t.setApproval(ApprovalNewState.DSZDSH.getCode());
 				}else {
 				}else {
-					Department dep = departmentMapper.selectByPrimaryKey(t.getOrderDep());
-					if(dep.getProvince()==11){
-						t.setApproval(ApprovalNewState.FZCDSH.getCode());
-					}else {
-						t.setApproval(ApprovalNewState.ZCDSH.getCode());
-					}
+					t.setApproval(ApprovalNewState.ZCDSH.getCode());
 				}
 				}
 			}
 			}
 			//生成流转
 			//生成流转