Browse Source

修改订单跳过审核修改开发

anderx 1 year ago
parent
commit
d9c9125a4d

+ 13 - 12
src/main/java/com/goafanti/order/controller/AdminOrderReceivablesApiController.java

@@ -216,20 +216,21 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 			if (e.getType()!=null){
 				String[] split = e.getType().split(",");
 				StringBuilder str=new StringBuilder();
-				int index=1;
-				for (String s : split) {
-					if (index==Integer.parseInt(s)){
-						if (s.equals("0")){
-							str.append(ApprovalTypeEnums.getDesc(s))
-									.append("(").append(e.getTypeExplain()).append(")")
-									.append(",");
-						}else {
-							String desc = ApprovalTypeEnums.getDesc(Integer.parseInt(s));
-							str.append(desc).append(",");
+				int index = 1;
+				for (int i = 1; i < 9; i++) {
+					for (String s : split) {
+						if (index ==Integer.parseInt(s)){
+							if (ApprovalTypeEnums.QT.getCode().equals(Integer.parseInt(s))){
+								str.append(ApprovalTypeEnums.getDesc(s))
+										.append("(").append(e.getTypeExplain()).append(")")
+										.append(",");
+							}else {
+								str.append(ApprovalTypeEnums.getDesc(s)).append(",");
+							}
 						}
-						index++;
-						if (index==8)index=0;
 					}
+					index++;
+					if (index==8)index=0;
 				}
 				e.setType(str.substring(0,str.length()-1));
 			}

+ 15 - 13
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -379,21 +379,23 @@ public class OrderProjectApiController extends CertifyApiController {
 				if(e.getType()!=null) {
 					String[] split = e.getType().split(",");
 					StringBuilder stringBuilder = new StringBuilder();
-					int index= 1;
-					for (String s : split) {
-								if (index ==Integer.parseInt(s)){
-									if (ApprovalTypeEnums.QT.getCode().equals(Integer.valueOf(s))){
-										stringBuilder.append(ApprovalTypeEnums.getDesc(s))
-												.append("(").append(e.getTypeExplain()).append(")")
-												.append(",");
-									}else {
-										stringBuilder.append(ApprovalTypeEnums.getDesc(s)).append(",");
-									}
-									index++;
-									if (index==8)index=0;
+					int index = 1;
+					for (int i = 1; i < 9; i++) {
+						for (String s : split) {
+							if (index ==Integer.parseInt(s)){
+								if (ApprovalTypeEnums.QT.getCode().equals(Integer.parseInt(s))){
+									stringBuilder.append(ApprovalTypeEnums.getDesc(s))
+											.append("(").append(e.getTypeExplain()).append(")")
+											.append(",");
+								}else {
+									stringBuilder.append(ApprovalTypeEnums.getDesc(s)).append(",");
 								}
 							}
-					e.setType(stringBuilder.substring(0,stringBuilder.length()-1));
+						}
+						index++;
+						if (index==8)index=0;
+					}
+					if(stringBuilder.length()>0)e.setType(stringBuilder.substring(0,stringBuilder.length()-1));
 				}
 			}