合计数据格式化

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/DataInquiryListActivity.java

@@ -432,8 +432,10 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                         mTotalLl.setVisibility(View.VISIBLE);
                     mTotalSpreadImageView.setVisibility(View.VISIBLE);
                 } else {
-                    mTotalLl.setVisibility(View.GONE);
-                    mTotalSpreadImageView.setVisibility(View.GONE);
+                    if (mPageIndex == 1) {
+                        mTotalLl.setVisibility(View.GONE);
+                        mTotalSpreadImageView.setVisibility(View.GONE);
+                    }
                 }
 
                 mDataInquiryTotalAdapter.notifyDataSetChanged();
@@ -577,7 +579,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                             String type = optStringNotNull(dataObject, "type");
                             String table = optStringNotNull(dataObject, "table");
 
-                            if (!dataObject.isNull("properties")) {
+                            if (!dataObject.isNull("properties") && ("CBG".equals(type) || "EC".equals(type) || "C".equals(type) || "R".equals(type))) {
                                 JSONArray properties = dataObject.optJSONArray("properties");
                                 if (properties != null) {
                                     List<SchemeConditionBean.Property> propertyList = new ArrayList<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/activity/ReportQueryCriteriaActivity.java

@@ -81,7 +81,7 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
                                         String type = optStringNotNull(conditionObject, "type");
                                         String readOnly = optStringNotNull(conditionObject, "readOnly");
 
-                                        if (!conditionObject.isNull("properties")) {
+                                        if (!conditionObject.isNull("properties") && ("CBG".equals(type) || "EC".equals(type) || "C".equals(type) || "R".equals(type))) {
                                             JSONArray properties = conditionObject.optJSONArray("properties");
                                             if (properties != null) {
                                                 List<ReportConditionBean.Property> propertyList = new ArrayList<>();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/datainquiry/adapter/DataInquiryTotalAdapter.java

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.DataInquiryTotalBean;
 
-import java.math.BigDecimal;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,11 +22,14 @@ public class DataInquiryTotalAdapter extends BaseAdapter {
 
     private Context context;
     private LayoutInflater layoutInflater;
+    private NumberFormat mNumberFormat;
 
     public DataInquiryTotalAdapter(Context context, List<DataInquiryTotalBean> objects) {
         this.context = context;
         this.layoutInflater = LayoutInflater.from(context);
         this.objects = objects;
+        mNumberFormat = NumberFormat.getInstance();
+        mNumberFormat.setMaximumFractionDigits(2);
     }
 
     public List<DataInquiryTotalBean> getObjects() {
@@ -64,7 +67,7 @@ public class DataInquiryTotalAdapter extends BaseAdapter {
 
     private void initializeViews(DataInquiryTotalBean object, ViewHolder holder, int position) {
         holder.dataInquiryItemTotalCaption.setText("当前合计" + object.getCaption() + ":");
-        holder.dataInquiryItemTotalValue.setText(BigDecimal.valueOf(object.getTotal()) + "");
+        holder.dataInquiryItemTotalValue.setText(mNumberFormat.format(object.getTotal()));
 
         holder.dataInquiryItemTotalDeleteIv.setOnClickListener(new View.OnClickListener() {
             @Override

WeiChat/src/main/res/layout/item_list_data_inquiry_total.xml

@@ -38,5 +38,6 @@
         android:layout_height="12dp"
         android:paddingRight="10dp"
         android:scaleType="centerInside"
-        android:src="@drawable/to_back"/>
+        android:src="@drawable/to_back"
+        android:visibility="gone"/>
 </LinearLayout>

WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-#release_version=false
-release_version=true
+release_version=false
+#release_version=true