提交分类： 测试版本；

提交内容：  商机替代报价需求完成备份
当前版本：  正式版本6.3.7
是否冲突：  否

app_modular/appworks/src/main/java/com/uas/appworks/activity/B2BBusinessMainActivity.java

@@ -521,19 +521,21 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
         for (int i = 0; i < contentArray.size(); i++) {
             JSONObject contentObject = contentArray.getJSONObject(i);
             if (contentObject != null) {
+                JSONObject quotationObject = contentObject.getJSONObject("quotation");
+
                 B2BBusinessListBean b2BBusinessListBean = new B2BBusinessListBean();
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.COMPANY_BUSINESS_LIST);
 
                 int quoted = 0;
-                if (!TextUtils.isEmpty(contentObject.getString("newId"))) {
-                    b2BBusinessListBean.setJsonData(contentObject.toString());
-                    quoted = 1;
-                }
 
                 if (TextUtils.isEmpty(contentObject.getString("newId"))) {
                     b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "itemId"));
                 } else {
                     b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "newId"));
+                    if (quotationObject != null) {
+                        b2BBusinessListBean.setJsonData(quotationObject.toString());
+                    }
+                    quoted = 1;
                 }
 
                 long date = contentObject.getLongValue("date");
@@ -601,10 +603,6 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
 
                 int quoted = JSONUtil.getInt(contentObject, "quoted");
-                if (TextUtils.isEmpty(contentObject.getString("quoted"))) {
-                    b2BBusinessListBean.setJsonData(contentObject.toString());
-                    quoted = 1;
-                }
 
                 if (TextUtils.isEmpty(contentObject.getString("quteId"))) {
                     b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));
@@ -617,7 +615,7 @@ public class B2BBusinessMainActivity extends BaseMVPActivity<WorkPlatPresenter>
                     b2BBusinessListBean.setBillDate(DateFormatUtil.long2Str(date, DateFormatUtil.YMD));
                 }
 
-                String needquantity = JSONUtil.getText(contentObject, "needQty");
+                String needquantity = JSONUtil.getText(contentObject, "needquantity");
                 b2BBusinessListBean.setProductAmount(needquantity);
 
                 JSONObject inquiryObject = contentObject.getJSONObject("inquiry");

app_modular/appworks/src/main/java/com/uas/appworks/activity/CompanyBusinessListActivity.java

@@ -309,19 +309,20 @@ public class CompanyBusinessListActivity extends BaseMVPActivity<SimplePresenter
         for (int i = 0; i < contentArray.size(); i++) {
             JSONObject contentObject = contentArray.getJSONObject(i);
             if (contentObject != null) {
+                JSONObject quotationObject = contentObject.getJSONObject("quotation");
                 B2BBusinessListBean b2BBusinessListBean = new B2BBusinessListBean();
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.COMPANY_BUSINESS_LIST);
 
                 int quoted = 0;
-                if (!TextUtils.isEmpty(contentObject.getString("newId"))) {
-                    b2BBusinessListBean.setJsonData(contentObject.toString());
-                    quoted = 1;
-                }
 
                 if (TextUtils.isEmpty(contentObject.getString("newId"))) {
                     b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "itemId"));
                 } else {
                     b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "newId"));
+                    if (quotationObject != null) {
+                        b2BBusinessListBean.setJsonData(quotationObject.toString());
+                    }
+                    quoted = 1;
                 }
 
                 long date = contentObject.getLongValue("date");
@@ -363,7 +364,7 @@ public class CompanyBusinessListActivity extends BaseMVPActivity<SimplePresenter
                 if (quoted == 1) {
                     b2BBusinessListBean.setBillState(Constants.FLAG.STATE_COMPANY_BUSINESS_DONE);
                 } else {
-                    b2BBusinessListBean.setJsonData(contentObject.toString());
+                    b2BBusinessListBean.setJsonData(quotationObject.toString());
                     if (remainingTime <= 0) {
                         b2BBusinessListBean.setBillState(Constants.FLAG.STATE_COMPANY_BUSINESS_INVALID);
                     } else {

app_modular/appworks/src/main/java/com/uas/appworks/activity/PublicInquiryDetailActivity.java

@@ -117,7 +117,6 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
         } else {
             showLoading(null);
 
-
             Map<String, Object> params = new HashMap<>();
             params.put("en_uu", mEnuu);
             params.put("user_tel", MyApplication.getInstance().mLoginUser.getTelephone());
@@ -147,7 +146,7 @@ public class PublicInquiryDetailActivity extends BaseMVPActivity<WorkPlatPresent
                 amount = "", currency = "", taxrate = "",
                 replaceBrand = "", replaceCmpCode = "", replaceSpec = "";
 
-        amount = JSONUtil.getText(contentObject, "needQty");
+        amount = JSONUtil.getText(contentObject, "needquantity");
         contact = JSONUtil.getText(contentObject, "userName");
         phone = JSONUtil.getText(contentObject, "userTel");
         currency = JSONUtil.getText(contentObject, "currency");

app_modular/appworks/src/main/java/com/uas/appworks/fragment/B2BBusinessListFragment.java

@@ -407,10 +407,6 @@ public class B2BBusinessListFragment extends BaseMVPFragment<WorkPlatPresenter>
                 b2BBusinessListBean.setItemType(B2BBusinessListBean.PUBLIC_INQUIRY_LIST);
 
                 int quoted = JSONUtil.getInt(contentObject, "quoted");
-                if (TextUtils.isEmpty(contentObject.getString("quoted"))) {
-                    b2BBusinessListBean.setJsonData(contentObject.toString());
-                    quoted = 1;
-                }
 
                 if (TextUtils.isEmpty(contentObject.getString("quteId"))) {
                     b2BBusinessListBean.setId(JSONUtil.getText(contentObject, "id"));