|
@@ -729,20 +729,8 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
|
|
}
|
|
}
|
|
}
|
|
}
|
|
fieldName = stringJoinerView.toString();
|
|
fieldName = stringJoinerView.toString();
|
|
- } else {
|
|
|
|
- for (Map.Entry<String, String> entry : SystemConstant.SOP_TRANSFORM_MAP.entrySet()) {
|
|
|
|
- if (Objects.equals(entry.getKey(), "pendApproveName")) {
|
|
|
|
- pendApproveName = true;
|
|
|
|
- } else if (Objects.equals(entry.getKey(), "taskName")) {
|
|
|
|
- stringJoinerDefaultView.add("IFNULL(" + entry.getValue() + ",'--') as " + entry.getKey());
|
|
|
|
- } else if (Objects.equals(entry.getKey(), "sopNo")) {
|
|
|
|
- stringJoinerDefaultFieldOrderView.add(entry.getValue() + " desc");
|
|
|
|
- stringJoinerDefaultView.add(entry.getValue() + " as " + entry.getKey());
|
|
|
|
- } else {
|
|
|
|
- stringJoinerDefaultView.add(entry.getValue() + " as " + entry.getKey());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
+ stringJoinerDefaultView.add(SystemConstant.SOP_TRANSFORM_MAP.get("status") + " as status");
|
|
defaultFieldName = stringJoinerDefaultView.toString();
|
|
defaultFieldName = stringJoinerDefaultView.toString();
|
|
defaultFieldOrder = stringJoinerDefaultFieldOrderView.toString();
|
|
defaultFieldOrder = stringJoinerDefaultFieldOrderView.toString();
|
|
|
|
|