|
|
@@ -1374,15 +1374,21 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
if (out.getType()!=null){
|
|
|
String[] split = out.getType().split(",");
|
|
|
StringBuilder str=new StringBuilder();
|
|
|
- for (String s : split) {
|
|
|
- if (s.equals("0")){
|
|
|
- str.append(ApprovalTypeEnums.getDesc(s))
|
|
|
- .append("(").append(out.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(out.getTypeExplain()).append(")")
|
|
|
+ .append(",");
|
|
|
+ }else {
|
|
|
+ str.append(ApprovalTypeEnums.getDesc(s)).append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+ index++;
|
|
|
+ if (index==8)index=0;
|
|
|
}
|
|
|
out.setType(str.substring(0,str.length()-1));
|
|
|
}
|