提交 f15e8ac3 authored 作者: lgd's avatar lgd

1.修改小数点

2.//TODO 坩埚下单,mes其他页面,mes用户反馈空也展示,编辑任务担当无法修改
上级 47f3950f
...@@ -19,6 +19,7 @@ import com.wd.workoffice.bean.event.AddFinancialNumEvent; ...@@ -19,6 +19,7 @@ import com.wd.workoffice.bean.event.AddFinancialNumEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.FinancialAddAdapter; import com.wd.workoffice.ui.adapter.FinancialAddAdapter;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.PickTimeUtils; import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.UserKeeper; import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -207,12 +208,12 @@ public class StoreFinancialAddActivity extends WorkToolBarActivity { ...@@ -207,12 +208,12 @@ public class StoreFinancialAddActivity extends WorkToolBarActivity {
private void changeNum() { private void changeNum() {
Map<Integer, String> num = dataAdapter.getNum(); Map<Integer, String> num = dataAdapter.getNum();
int total = 0; String total ="0";
List<JSONObject> financeTaxItems = new ArrayList<>(); List<JSONObject> financeTaxItems = new ArrayList<>();
for (Map.Entry<Integer, String> entry : num.entrySet()) { for (Map.Entry<Integer, String> entry : num.entrySet()) {
String value = entry.getValue(); String value = entry.getValue();
if (!TextUtils.isEmpty(value)) { if (!TextUtils.isEmpty(value)) {
total += Integer.valueOf(value); total = MathUtils.add(value,total,3);
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
data.put("taxType", dataList.get(entry.getKey()).getId()); data.put("taxType", dataList.get(entry.getKey()).getId());
data.put("amount", value); data.put("amount", value);
...@@ -221,6 +222,6 @@ public class StoreFinancialAddActivity extends WorkToolBarActivity { ...@@ -221,6 +222,6 @@ public class StoreFinancialAddActivity extends WorkToolBarActivity {
} }
param.put("totalMoney", total); param.put("totalMoney", total);
param.put("financeTaxItems", financeTaxItems); param.put("financeTaxItems", financeTaxItems);
tvTotal.setText(total + ""); tvTotal.setText(total );
} }
} }
...@@ -199,7 +199,7 @@ public class DeviceBuyConfirmActivity extends WorkToolBarActivity { ...@@ -199,7 +199,7 @@ public class DeviceBuyConfirmActivity extends WorkToolBarActivity {
tvNum.setText("共 ".concat(proList.size() + "").concat(" 件")); tvNum.setText("共 ".concat(proList.size() + "").concat(" 件"));
String allPrice = ""; String allPrice = "";
for (DeviceBean.RecordsBean recordsBean : proList) { for (DeviceBean.RecordsBean recordsBean : proList) {
allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() + "", recordsBean.getCarPrice() + "", 2), 2); allPrice = MathUtils.add(allPrice, MathUtils.multiply(recordsBean.getCarNum() , recordsBean.getCarPrice() , 3), 3);
} }
tvPrice.setText("总计: ¥ ".concat(allPrice)); tvPrice.setText("总计: ¥ ".concat(allPrice));
} }
......
...@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.FinancialBean; import com.wd.workoffice.bean.FinancialBean;
import com.wd.workoffice.bean.LogisticBean; import com.wd.workoffice.bean.LogisticBean;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -25,7 +26,7 @@ public class FinancialAdapter extends BaseQuickAdapter<FinancialBean.RecordsBean ...@@ -25,7 +26,7 @@ public class FinancialAdapter extends BaseQuickAdapter<FinancialBean.RecordsBean
@Override @Override
protected void convert(BaseViewHolder helper, FinancialBean.RecordsBean item) { protected void convert(BaseViewHolder helper, FinancialBean.RecordsBean item) {
helper.setText(R.id.tv_price, String.valueOf(item.getTotalMoney())); helper.setText(R.id.tv_price, MathUtils.converData(item.getTotalMoney(),3));
helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus()))); helper.setText(R.id.tv_status, WorkUtils.getFinancialStatus(Integer.valueOf(item.getStatus())));
helper.setText(R.id.tv_time, item.getPayDate() + ""); helper.setText(R.id.tv_time, item.getPayDate() + "");
if (TextUtils.equals("2", item.getStatus())) { if (TextUtils.equals("2", item.getStatus())) {
......
...@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.FinancialTypeBean; import com.wd.workoffice.bean.FinancialTypeBean;
import com.wd.workoffice.bean.event.AddFinancialNumEvent; import com.wd.workoffice.bean.event.AddFinancialNumEvent;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
...@@ -48,7 +49,7 @@ public class FinancialAddAdapter extends BaseQuickAdapter<FinancialTypeBean, Bas ...@@ -48,7 +49,7 @@ public class FinancialAddAdapter extends BaseQuickAdapter<FinancialTypeBean, Bas
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
WorkUtils.keepDecimals(etNum);
} }
@Override @Override
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="0" android:text="0"
android:id="@+id/et_num" android:id="@+id/et_num"
android:inputType="number" android:inputType="numberDecimal"
android:paddingHorizontal="5mm" android:paddingHorizontal="5mm"
android:textColor="#fff56c6c" android:textColor="#fff56c6c"
android:background="@null" android:background="@null"
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论