|
|
@@ -156,27 +156,34 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
|
|
|
mPresenter.initLoad();
|
|
|
} else if (90 == requestCode && 90 == resultCode) {
|
|
|
String json = data.getStringExtra("data");
|
|
|
- if (!StringUtil.isEmpty(json) && JSONUtil.validateJSONObject(json)) {
|
|
|
- JSONObject object = JSON.parseObject(json);
|
|
|
- if (mAdapter != null) {
|
|
|
- List<Approval> models = mAdapter.getDbFind();
|
|
|
- for (Approval e : models) {
|
|
|
- if (e.isNeerInput() && (e.getType() == Approval.MAIN || e.getType() == Approval.DETAIL)) {
|
|
|
- for (Map.Entry<String, Object> map : object.entrySet()) {
|
|
|
- if (map.getKey().equals(e.getValuesKey()) && map.getValue() != null) {
|
|
|
- e.setValues(map.getValue().toString());
|
|
|
- }
|
|
|
+ try {
|
|
|
+ updateDbFindKey(json);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ super.onActivityResult(requestCode, resultCode, data);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void updateDbFindKey(String message) throws Exception {
|
|
|
+ if (!StringUtil.isEmpty(message) && JSONUtil.validateJSONObject(message)) {
|
|
|
+ JSONObject object = JSON.parseObject(message);
|
|
|
+ if (mAdapter != null) {
|
|
|
+ List<Approval> models = mAdapter.getDbFind();
|
|
|
+ for (Approval e : models) {
|
|
|
+ if (e.isNeerInput() && (e.getType() == Approval.MAIN || e.getType() == Approval.DETAIL)) {
|
|
|
+ for (Map.Entry<String, Object> map : object.entrySet()) {
|
|
|
+ if (map.getKey().equals(e.getValuesKey()) && map.getValue() != null) {
|
|
|
+ e.setValues(map.getValue().toString());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- mAdapter.notifyDataSetChanged();
|
|
|
}
|
|
|
+ mAdapter.notifyDataSetChanged();
|
|
|
}
|
|
|
}
|
|
|
- super.onActivityResult(requestCode, resultCode, data);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
|
super.onCreate(savedInstanceState);
|