Browse Source

Merge branch 'MoneyNote3.0' of http://git.quyaqu.com/xieshengqi/MoneyMoreMoreNote into MoneyNote3.0

e 6 years ago
parent
commit
75ddfa27cc

+ 1 - 0
app/src/main/java/com/kuxuan/moneynote/ui/activitys/account/AccountModel.java

105
         categoryDBbean.setMonth(Integer.parseInt(split[1]));
105
         categoryDBbean.setMonth(Integer.parseInt(split[1]));
106
         categoryDBbean.setDay(Integer.parseInt(split[2]));
106
         categoryDBbean.setDay(Integer.parseInt(split[2]));
107
         categoryDBbean.setUpdateTime(System.currentTimeMillis());
107
         categoryDBbean.setUpdateTime(System.currentTimeMillis());
108
+        categoryDBbean.setCreateTime(System.currentTimeMillis());
108
         categoryDBbean.setDemo(billBody.getDemo());
109
         categoryDBbean.setDemo(billBody.getDemo());
109
         categoryDBbean.setName(name);
110
         categoryDBbean.setName(name);
110
         categoryDBbean.setType_imagepath(BillCategoreDaoOperator.newInstance().getDetaillIconUrlById(Integer.parseInt(billBody.getCategory_id())));
111
         categoryDBbean.setType_imagepath(BillCategoreDaoOperator.newInstance().getDetaillIconUrlById(Integer.parseInt(billBody.getCategory_id())));

+ 1 - 0
app/src/main/java/com/kuxuan/moneynote/ui/fragments/details/DetialDBOpertor.java

152
             java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
152
             java.text.DecimalFormat df = new java.text.DecimalFormat("########.00");
153
             typeDataJson.setAccount( df.format(list.get(i).getAccount()) + "");
153
             typeDataJson.setAccount( df.format(list.get(i).getAccount()) + "");
154
             typeDataJson.setName(list.get(i).getName());
154
             typeDataJson.setName(list.get(i).getName());
155
+            typeDataJson.setDemo(list.get(i).getDemo());
155
             datas.add(typeDataJson);
156
             datas.add(typeDataJson);
156
         }
157
         }
157
         return datas;
158
         return datas;